camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/3] git commit: CAMEL-7843: Upgrade to Karaf 2.4.0
Date Sat, 20 Sep 2014 18:24:08 GMT
Repository: camel
Updated Branches:
  refs/heads/master 42fbf6779 -> a49627216


CAMEL-7843: Upgrade to Karaf 2.4.0


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f23934a1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f23934a1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f23934a1

Branch: refs/heads/master
Commit: f23934a18afec004cf1a71272617df991f1d79f8
Parents: 42fbf67
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Sat Sep 20 19:34:39 2014 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sat Sep 20 19:34:39 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/f23934a1/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index be6230e..7b3b73c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -276,7 +276,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.7</karaf-version>
+    <karaf-version>2.4.0</karaf-version>
     <karaf3-version>3.0.1</karaf3-version>
     <kie-version>6.1.0.Final</kie-version>
     <krati-version>0.4.9</krati-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/f23934a1/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 c0d3687..2e7272d 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
@@ -195,7 +195,7 @@ public abstract class AbstractFeatureTest {
         }
         if (karafVersion == null) {
             // setup the default version of it
-            karafVersion = "2.3.7";
+            karafVersion = "2.4.0";
         }
         return karafVersion;
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/f23934a1/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 b1061df..bf01f80 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.3.7";
+            karafVersion = "2.4.0";
         }
         return karafVersion;
     }


Mime
View raw message