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 2016/04/28 17:19:59 UTC
[2/3] camel git commit: Upgrade karaf
Upgrade karaf
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/935f3660
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/935f3660
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/935f3660
Branch: refs/heads/master
Commit: 935f36603587c9c2b53607a7a66f96d6a14f2368
Parents: 3e903b3
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Apr 28 17:03:54 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 28 17:03:54 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/935f3660/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java
----------------------------------------------------------------------
diff --git a/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java b/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java
index a2acca6..e75b278 100644
--- a/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java
+++ b/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java
@@ -249,7 +249,7 @@ public abstract class AbstractFeatureTest {
}
if (karafVersion == null) {
// setup the default version of it
- karafVersion = "4.0.4";
+ karafVersion = "4.0.5";
}
return karafVersion;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/935f3660/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ac5b391..02c9a49 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -352,7 +352,7 @@
<kafka-bundle-version>0.9.0.1_1</kafka-bundle-version>
<karaf-version>2.4.4</karaf-version>
<karaf3-version>3.0.6</karaf3-version>
- <karaf4-version>4.0.4</karaf4-version>
+ <karaf4-version>4.0.5</karaf4-version>
<kie-version>6.4.0.Final</kie-version>
<krati-version>0.4.9</krati-version>
<kubernetes-client-version>1.3.83</kubernetes-client-version>