Repository: camel Updated Branches: refs/heads/master 5e300c4d2 -> 58dea1965
Update Ignite to version 1.9.0 and aligned Karaf feature integration test Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/58dea196 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/58dea196 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/58dea196 Branch: refs/heads/master Commit: 58dea1965b020dcf8da817201e88eada5d387ef5 Parents: 5e300c4 Author: Andrea Cosentino <anco...@gmail.com> Authored: Fri Mar 10 12:57:25 2017 +0100 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Fri Mar 10 12:57:25 2017 +0100 ---------------------------------------------------------------------- parent/pom.xml | 3 +-- platforms/karaf/features/src/main/resources/features.xml | 2 +- .../test/java/org/apache/camel/itest/karaf/CamelIgniteTest.java | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/58dea196/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 3835a3d..e9245ae 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -274,8 +274,7 @@ <ibatis-bundle-version>2.3.4.726_4</ibatis-bundle-version> <ibatis-version>2.3.4.726</ibatis-version> <ical4j-version>1.0.7</ical4j-version> - <ignite-version>1.8.0</ignite-version> - <ignite-version-range>[1.5.0-b1,1.6)</ignite-version-range> + <ignite-version>1.9.0</ignite-version> <infinispan-version>8.2.6.Final</infinispan-version> <influx-java-driver-version>2.5</influx-java-driver-version> <influx-java-driver-bundle-version>2.5_1</influx-java-driver-bundle-version> http://git-wip-us.apache.org/repos/asf/camel/blob/58dea196/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 b52f404..a805df4 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -875,7 +875,7 @@ Please refer to the component page (https://camel.apache.org/ignite.html) and to the Ignite docs (https://apacheignite.readme.io/docs/osgi-installation-in-karaf#preparatory-steps) for more information.]]> </details> <feature version='${project.version}'>camel-core</feature> - <feature version='${ignite-version-range}'>ignite-core</feature> + <feature version='${ignite-version}'>ignite-core</feature> <bundle>mvn:org.apache.camel/camel-ignite/${project.version}</bundle> </feature> <feature name='camel-infinispan' version='${project.version}' resolver='(obr)' start-level='50'> http://git-wip-us.apache.org/repos/asf/camel/blob/58dea196/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIgniteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIgniteTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIgniteTest.java index 82dffcd..03a5803 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIgniteTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelIgniteTest.java @@ -47,7 +47,7 @@ public class CamelIgniteTest extends BaseKarafTest { @Test public void test() throws Exception { // install ignite first - String version = "1.5.0.final"; + String version = "1.9.0"; LOG.info("Using Apache Ignite version: {}", version); URI url = new URI("mvn:org.apache.ignite/ignite-osgi-karaf/" + version + "/xml/features"); @@ -58,4 +58,4 @@ public class CamelIgniteTest extends BaseKarafTest { testComponent(COMPONENT); } -} \ No newline at end of file +}