Repository: camel Updated Branches: refs/heads/master 891b18710 -> 0bcc96e88
Update Elasticsearch bundle to version 2.2.0 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0bcc96e8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0bcc96e8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0bcc96e8 Branch: refs/heads/master Commit: 0bcc96e8803e2ab389abc21a34b1427de0729b7f Parents: 891b187 Author: Andrea Cosentino <anco...@gmail.com> Authored: Wed Mar 16 13:51:33 2016 +0100 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Wed Mar 16 13:51:59 2016 +0100 ---------------------------------------------------------------------- parent/pom.xml | 3 ++- platforms/karaf/features/src/main/resources/features.xml | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/0bcc96e8/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index cf73f2e..b8a75b3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -151,7 +151,8 @@ <ehcache-version>2.10.1</ehcache-version> <egit-github-core-version>2.1.5</egit-github-core-version> <egit-github-core-bundle-version>2.1.5_1</egit-github-core-bundle-version> - <elasticsearch-bundle-version>2.1.1_2</elasticsearch-bundle-version> + <elasticsearch-bundle-version>2.2.0_1</elasticsearch-bundle-version> + <elasticsearch-guava-version>18.0</elasticsearch-guava-version> <elasticsearch-version>2.2.0</elasticsearch-version> <elasticsearch-cluster-runner-version>2.2.0.0</elasticsearch-cluster-runner-version> <elsql-version>1.2</elsql-version> http://git-wip-us.apache.org/repos/asf/camel/blob/0bcc96e8/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index d45dc34..ac7ab20 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -387,10 +387,14 @@ <feature name='camel-elasticsearch' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> <feature>http</feature> - <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle> + <bundle dependency='true'>mvn:com.google.guava/guava/${elasticsearch-guava-version}</bundle> <bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-smile/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson2-version}</bundle> + <bundle dependency='true'>mvn:com.ning/compress-lzf/${compress-lzf-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jakarta-regexp/${regexp-bundle-version}</bundle> <bundle dependency='true'>mvn:org.mvel/mvel2/${mvel-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene/${lucene-bundle-version}</bundle>
