Repository: camel Updated Branches: refs/heads/master 42f66bc33 -> 7a6d7238a
CAMEL-8254: Upgraded elastichsearch and fixed test (it takes about 60 sec to run but it works now) Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7a6d7238 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7a6d7238 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7a6d7238 Branch: refs/heads/master Commit: 7a6d7238afe01c2b59abb34f10f56cc3be30e120 Parents: 42f66bc Author: Claus Ibsen <[email protected]> Authored: Fri Jan 23 11:03:05 2015 +0100 Committer: Claus Ibsen <[email protected]> Committed: Fri Jan 23 11:03:05 2015 +0100 ---------------------------------------------------------------------- components/camel-elasticsearch/pom.xml | 14 -------------- .../elasticsearch/ElasticsearchComponentTest.java | 8 +------- parent/pom.xml | 4 ++-- 3 files changed, 3 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7a6d7238/components/camel-elasticsearch/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-elasticsearch/pom.xml b/components/camel-elasticsearch/pom.xml index e0a8175..724ce89 100644 --- a/components/camel-elasticsearch/pom.xml +++ b/components/camel-elasticsearch/pom.xml @@ -34,20 +34,6 @@ <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=elasticsearch</camel.osgi.export.service> </properties> - <repositories> - <repository> - <id>sonatype-oss</id> - <name>Sonatype OSS</name> - <url>http://oss.sonatype.org/content/repositories/releases/</url> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - </repositories> - <dependencies> <dependency> <groupId>org.apache.camel</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/7a6d7238/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchComponentTest.java ---------------------------------------------------------------------- diff --git a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchComponentTest.java b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchComponentTest.java index 8398c2a..62ab6a7 100644 --- a/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchComponentTest.java +++ b/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchComponentTest.java @@ -43,14 +43,8 @@ public class ElasticsearchComponentTest extends CamelTestSupport { @Override @Before public void setUp() throws Exception { - super.setUp(); deleteDirectory("target/data"); - } - - @Override - public boolean isCreateCamelContextPerClass() { - // let's speed up the tests using the same context - return true; + super.setUp(); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/7a6d7238/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index f1e729b..8fcc514 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -137,8 +137,8 @@ <eclipse-equinox-common-version>3.3.0-v20070426</eclipse-equinox-common-version> <ehcache-version>2.9.0</ehcache-version> <egit-github-core-version>2.1.5</egit-github-core-version> - <elasticsearch-bundle-version>1.3.4_1</elasticsearch-bundle-version> - <elasticsearch-version>1.3.4</elasticsearch-version> + <elasticsearch-bundle-version>1.4.1_1</elasticsearch-bundle-version> + <elasticsearch-version>1.4.2</elasticsearch-version> <el-api-1.0-version>1.0.1</el-api-1.0-version> <embedmongo-version>1.46.4</embedmongo-version> <exec-maven-plugin-version>1.2.1</exec-maven-plugin-version>
