Repository: camel Updated Branches: refs/heads/master fe5960aef -> e64ed926a
Upgrade to Karaf 2.4.3 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e64ed926 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e64ed926 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e64ed926 Branch: refs/heads/master Commit: e64ed926a8fcd73548c2305bfcb4d4f85ff80a93 Parents: fe5960a Author: Claus Ibsen <[email protected]> Authored: Mon Jul 13 14:52:03 2015 +0200 Committer: Claus Ibsen <[email protected]> Committed: Mon Jul 13 14:52:03 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/e64ed926/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 3339745..8e777d5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -311,7 +311,7 @@ <kafka-version>0.8.2.1</kafka-version> <kafka-bundle-version>0.8.2.1_1</kafka-bundle-version> <kafka-clients-bundle-version>0.8.2.0_1</kafka-clients-bundle-version> - <karaf-version>2.4.2</karaf-version> + <karaf-version>2.4.3</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/e64ed926/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 f0875fb..fb6c35a 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.2"; + karafVersion = "2.4.3"; } return karafVersion; }
