Repository: camel Updated Branches: refs/heads/master 7ca0c8756 -> dff401647
Upgrade to Karaf 2.4.2 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dff40164 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dff40164 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dff40164 Branch: refs/heads/master Commit: dff401647afdadc7b47f89e4cf684b9be79cbe94 Parents: 7ca0c87 Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Apr 27 09:41:34 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Apr 27 09:42:10 2015 +0200 ---------------------------------------------------------------------- parent/pom.xml | 2 +- .../org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/dff40164/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index d64f230..01381f0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -301,7 +301,7 @@ <jzlib-version>1.1.3</jzlib-version> <kafka-version>0.8.2.0</kafka-version> <kafka-bundle-version>0.8.2.0_1</kafka-bundle-version> - <karaf-version>2.4.1</karaf-version> + <karaf-version>2.4.2</karaf-version> <karaf3-version>3.0.2</karaf3-version> <kie-version>6.2.0.Final</kie-version> <krati-version>0.4.9</krati-version> http://git-wip-us.apache.org/repos/asf/camel/blob/dff40164/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java index 50d351b..f0875fb 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java @@ -160,7 +160,7 @@ public class OSGiIntegrationTestSupport extends CamelTestSupport { } if (karafVersion == null) { // setup the default version of it - karafVersion = "2.4.1"; + karafVersion = "2.4.2"; } return karafVersion; }
