Updated Branches:
refs/heads/camel-2.12.x 6e3c66a81 -> a29b9b121
Upgraded elasticsearch to the version 0.90.5.
Conflicts:
parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a29b9b12
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a29b9b12
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a29b9b12
Branch: refs/heads/camel-2.12.x
Commit: a29b9b121f9c637068f4d1638c910cf810f80508
Parents: 6e3c66a
Author: Babak Vahdat <bvah...@apache.org>
Authored: Sat Nov 9 16:37:15 2013 +0100
Committer: Babak Vahdat <bvah...@apache.org>
Committed: Sat Nov 9 18:23:48 2013 +0100
----------------------------------------------------------------------
components/camel-elasticsearch/pom.xml | 10 +++++-----
parent/pom.xml | 5 ++---
2 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a29b9b12/components/camel-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-elasticsearch/pom.xml
b/components/camel-elasticsearch/pom.xml
index 1a92dc3..b3da0f2 100644
--- a/components/camel-elasticsearch/pom.xml
+++ b/components/camel-elasticsearch/pom.xml
@@ -53,6 +53,11 @@
<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>
@@ -77,11 +82,6 @@
<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/a29b9b12/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index dcf9738..79421a2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -120,9 +120,8 @@
<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>
- <!-- 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>
+ <elasticsearch-bundle-version>0.90.5_1</elasticsearch-bundle-version>
+ <elasticsearch-version>0.90.5</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>
