You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2011/11/16 10:09:33 UTC
svn commit: r1202598 - in /servicemix/smx4/nmr/trunk/jbi/itests: pom.xml
src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java
src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java
Author: ffang
Date: Wed Nov 16 09:09:33 2011
New Revision: 1202598
URL: http://svn.apache.org/viewvc?rev=1202598&view=rev
Log:
[SMX4NMR-285]Upgrade to Karaf 2.2.4
Modified:
servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java
Modified: servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/pom.xml?rev=1202598&r1=1202597&r2=1202598&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/pom.xml Wed Nov 16 09:09:33 2011
@@ -229,8 +229,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.management</artifactId>
+ <groupId>org.apache.karaf.management</groupId>
+ <artifactId>org.apache.karaf.management.server</artifactId>
</dependency>
<dependency>
<groupId>org.apache.karaf.jaas</groupId>
Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java?rev=1202598&r1=1202597&r2=1202598&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java Wed Nov 16 09:09:33 2011
@@ -246,7 +246,7 @@ public class IntegrationTest extends Abs
// hack system packages
- systemPackages("org.apache.karaf.main.spi;version=1.6.0", "org.apache.karaf.jaas.boot;version=1.6.0"),
+ systemPackages("org.apache.karaf.main.spi;version=2.4.0", "org.apache.karaf.jaas.boot;version=2.4.0"),
bootClasspathLibrary(mavenBundle("org.apache.karaf.jaas", "org.apache.karaf.jaas.boot")).afterFramework(),
bootClasspathLibrary(mavenBundle("org.apache.karaf", "org.apache.karaf.main")).afterFramework(),
bootClasspathLibrary(mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec")).beforeFramework(),
@@ -267,7 +267,7 @@ public class IntegrationTest extends Abs
// Bundles
mavenBundle("org.apache.mina", "mina-core"),
mavenBundle("org.apache.sshd", "sshd-core"),
- mavenBundle("org.apache.karaf", "org.apache.karaf.management"),
+ mavenBundle("org.apache.karaf.management", "org.apache.karaf.management.server"),
mavenBundle("org.apache.karaf.jaas", "org.apache.karaf.jaas.config"),
mavenBundle("org.apache.felix", "org.apache.felix.gogo.runtime"),
mavenBundle("org.apache.karaf.shell", "org.apache.karaf.shell.console"),
Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java?rev=1202598&r1=1202597&r2=1202598&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java Wed Nov 16 09:09:33 2011
@@ -266,7 +266,7 @@ public class ManagementTest extends Abst
),
// hack system packages
- systemPackages("org.apache.karaf.main.spi;version=1.0.0", "org.apache.karaf.jaas.boot;version=0.9.0"),
+ systemPackages("org.apache.karaf.main.spi;version=2.4.0", "org.apache.karaf.jaas.boot;version=2.4.0"),
bootClasspathLibrary(mavenBundle("org.apache.karaf.jaas", "org.apache.karaf.jaas.boot")).afterFramework(),
bootClasspathLibrary(mavenBundle("org.apache.karaf", "org.apache.karaf.main")).afterFramework(),
bootClasspathLibrary(mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec")).beforeFramework(),
@@ -292,8 +292,7 @@ public class ManagementTest extends Abst
mavenBundle("org.apache.karaf.shell", "org.apache.karaf.shell.console"),
mavenBundle("org.apache.karaf.shell", "org.apache.karaf.shell.osgi"),
mavenBundle("org.apache.karaf.shell", "org.apache.karaf.shell.log").noStart(),
- mavenBundle("org.apache.karaf", "org.apache.karaf.management"),
-
+ mavenBundle("org.apache.karaf.management", "org.apache.karaf.management.server"),
equinox(),
// Spring