You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2014/03/02 13:15:39 UTC
git commit: Add the missing pieces for the upgrade to Karaf 2.3.4
Repository: camel
Updated Branches:
refs/heads/master 89b179264 -> b85536431
Add the missing pieces for the upgrade to Karaf 2.3.4
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b8553643
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b8553643
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b8553643
Branch: refs/heads/master
Commit: b85536431668c8e81394edee0a426fc6e9995a37
Parents: 89b1792
Author: Babak Vahdat <bv...@apache.org>
Authored: Sun Mar 2 13:14:04 2014 +0100
Committer: Babak Vahdat <bv...@apache.org>
Committed: Sun Mar 2 13:14:04 2014 +0100
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/config.properties | 6 +++---
.../java/org/apache/camel/itest/karaf/AbstractFeatureTest.java | 2 +-
.../apache/camel/itest/osgi/OSGiIntegrationTestSupport.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b8553643/platforms/karaf/features/src/main/resources/config.properties
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/config.properties b/platforms/karaf/features/src/main/resources/config.properties
index d85b437..69b6fff 100755
--- a/platforms/karaf/features/src/main/resources/config.properties
+++ b/platforms/karaf/features/src/main/resources/config.properties
@@ -35,9 +35,9 @@ org.osgi.framework.system.packages= \
org.osgi.service.packageadmin;uses:="org.osgi.framework";version="1.2",\
org.osgi.service.url;version="1.0", \
org.osgi.util.tracker;uses:="org.osgi.framework";version="1.5.1", \
- org.apache.karaf.jaas.boot;version="2.3.3", \
- org.apache.karaf.jaas.boot.principal;version="2.3.3", \
- org.apache.karaf.version;version="2.3.3", \
+ org.apache.karaf.jaas.boot;version="2.3.4", \
+ org.apache.karaf.jaas.boot.principal;version="2.3.4", \
+ org.apache.karaf.version;version="2.3.4", \
${jre-${java.specification.version}}
org.osgi.framework.bootdelegation=org.apache.karaf.jaas.boot,sun.*,com.sun.*,javax.transaction,javax.transaction.*
http://git-wip-us.apache.org/repos/asf/camel/blob/b8553643/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 14b89e4..ee0ce32 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
@@ -155,7 +155,7 @@ public abstract class AbstractFeatureTest {
new Option[]{
karafDistributionConfiguration().frameworkUrl(
maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("tar.gz").versionAsInProject())
- .karafVersion("2.3.3").name("Apache Karaf")
+ .karafVersion("2.3.4").name("Apache Karaf")
.unpackDirectory(new File("target/paxexam/unpack/")),
KarafDistributionOption.keepRuntimeFolder(),
http://git-wip-us.apache.org/repos/asf/camel/blob/b8553643/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 5e8282c..95963e9 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.3")
+ .karafVersion("2.3.4")
.name("Apache Karaf")
.useDeployFolder(false).unpackDirectory(new File("target/paxexam/unpack/")),