camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject camel git commit: Upgrade to Karaf 2.4.4
Date Wed, 27 Jan 2016 08:04:42 GMT
Repository: camel
Updated Branches:
  refs/heads/master c79fbed7e -> f21b9ab1e


Upgrade to Karaf 2.4.4


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

Branch: refs/heads/master
Commit: f21b9ab1e64a82708e4531261aa9bce309d0b12b
Parents: c79fbed
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Wed Jan 27 09:04:29 2016 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Wed Jan 27 09:04:29 2016 +0100

----------------------------------------------------------------------
 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/f21b9ab1/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ae55eb7..b7c3676 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -344,7 +344,7 @@
     <kafka-version>0.9.0.0</kafka-version>
     <kafka-bundle-version>0.9.0.0_1</kafka-bundle-version>
     <kafka-clients-bundle-version>0.9.0.0_1</kafka-clients-bundle-version>
-    <karaf-version>2.4.3</karaf-version>
+    <karaf-version>2.4.4</karaf-version>
     <karaf3-version>3.0.2</karaf3-version>
     <kie-version>6.3.0.Final</kie-version>
     <krati-version>0.4.9</krati-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/f21b9ab1/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 fb6c35a..a9fce54 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.3";
+            karafVersion = "2.4.4";
         }
         return karafVersion;
     }


Mime
View raw message