Updated Branches: refs/heads/camel-2.12.x a29b9b121 -> da01da292
Revert "Upgraded elasticsearch to the version 0.90.5." This reverts commit a29b9b121f9c637068f4d1638c910cf810f80508. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/da01da29 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/da01da29 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/da01da29 Branch: refs/heads/camel-2.12.x Commit: da01da292c517b4a464761b0c8b88165b8f418eb Parents: a29b9b1 Author: Babak Vahdat <bvah...@apache.org> Authored: Sat Nov 9 18:47:07 2013 +0100 Committer: Babak Vahdat <bvah...@apache.org> Committed: Sat Nov 9 18:47:07 2013 +0100 ---------------------------------------------------------------------- components/camel-elasticsearch/pom.xml | 10 +++++----- parent/pom.xml | 5 +++-- 2 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/da01da29/components/camel-elasticsearch/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-elasticsearch/pom.xml b/components/camel-elasticsearch/pom.xml index b3da0f2..1a92dc3 100644 --- a/components/camel-elasticsearch/pom.xml +++ b/components/camel-elasticsearch/pom.xml @@ -53,11 +53,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-core</artifactId> </dependency> - <dependency> - <groupId>org.elasticsearch</groupId> - <artifactId>elasticsearch</artifactId> - <version>${elasticsearch-version}</version> - </dependency> <!-- for testing --> <dependency> @@ -82,6 +77,11 @@ <artifactId>slf4j-log4j12</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.elasticsearch</groupId> + <artifactId>elasticsearch</artifactId> + <version>${elasticsearch-version}</version> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/camel/blob/da01da29/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 79421a2..dcf9738 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -120,8 +120,9 @@ <easymock-version>3.2</easymock-version> <eclipse-equinox-common-version>3.3.0-v20070426</eclipse-equinox-common-version> <ehcache-version>2.7.4</ehcache-version> - <elasticsearch-bundle-version>0.90.5_1</elasticsearch-bundle-version> - <elasticsearch-version>0.90.5</elasticsearch-version> + <!-- The 0.20 bundle is flawed, see SMX4-1372 --> + <elasticsearch-bundle-version>0.19.10_1</elasticsearch-bundle-version> + <elasticsearch-version>0.20.6</elasticsearch-version> <el-api-1.0-version>1.0.1</el-api-1.0-version> <exec-maven-plugin-version>1.2.1</exec-maven-plugin-version> <ezmorph-bundle-version>1.0.6_1</ezmorph-bundle-version>
