You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2014/08/04 14:34:07 UTC
git commit: Upgrade to karaf 2.3.6
Repository: camel
Updated Branches:
refs/heads/master cb5941aa3 -> 14cb8b1c6
Upgrade to karaf 2.3.6
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/14cb8b1c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/14cb8b1c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/14cb8b1c
Branch: refs/heads/master
Commit: 14cb8b1c6afcbf7b2e13252e7c4b90d85909f013
Parents: cb5941a
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Aug 4 14:33:58 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Aug 4 14:33:58 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
.../java/org/apache/camel/itest/karaf/AbstractFeatureTest.java | 2 +-
.../org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/14cb8b1c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 277afef..31c1253 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -264,7 +264,7 @@
<jython-version>2.5.3</jython-version>
<kafka-version>0.8.1</kafka-version>
<kafka-bundle-version>0.8.1_1</kafka-bundle-version>
- <karaf-version>2.3.5</karaf-version>
+ <karaf-version>2.3.6</karaf-version>
<kie-version>6.0.0.Final</kie-version>
<krati-version>0.4.9</krati-version>
<kxml2-bundle-version>2.3.0_2</kxml2-bundle-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/14cb8b1c/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
index adae8ee..dfcd42f 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
@@ -159,7 +159,7 @@ public abstract class AbstractFeatureTest {
new Option[]{
karafDistributionConfiguration().frameworkUrl(
maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("tar.gz").versionAsInProject())
- .karafVersion("2.3.5").name("Apache Karaf")
+ .karafVersion("2.3.6").name("Apache Karaf")
.unpackDirectory(new File("target/paxexam/unpack/")),
KarafDistributionOption.keepRuntimeFolder(),
http://git-wip-us.apache.org/repos/asf/camel/blob/14cb8b1c/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 3a80643..cb4f9b6 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
@@ -132,7 +132,7 @@ public class OSGiIntegrationTestSupport extends CamelTestSupport {
new Option[] {
karafDistributionConfiguration()
.frameworkUrl(maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("tar.gz").versionAsInProject())
- .karafVersion("2.3.5")
+ .karafVersion("2.3.6")
.name("Apache Karaf")
.useDeployFolder(false).unpackDirectory(new File("target/paxexam/unpack/")),