servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r1188051 - in /servicemix/smx4/nmr/trunk: jbi/itests/pom.xml jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java parent/pom.xml
Date Mon, 24 Oct 2011 08:56:19 GMT
Author: gertv
Date: Mon Oct 24 08:56:19 2011
New Revision: 1188051

URL: http://svn.apache.org/viewvc?rev=1188051&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
    servicemix/smx4/nmr/trunk/parent/pom.xml

Modified: servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/pom.xml?rev=1188051&r1=1188050&r2=1188051&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/pom.xml Mon Oct 24 08:56:19 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=1188051&r1=1188050&r2=1188051&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
Mon Oct 24 08:56:19 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=1188051&r1=1188050&r2=1188051&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
Mon Oct 24 08:56:19 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=1.0.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,7 +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(),
 

Modified: servicemix/smx4/nmr/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/parent/pom.xml?rev=1188051&r1=1188050&r2=1188051&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/parent/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/parent/pom.xml Mon Oct 24 08:56:19 2011
@@ -44,7 +44,7 @@
     <activemq.version>5.5.0</activemq.version>
     <aries.version>0.3</aries.version>
     <camel.version>2.8.1</camel.version>
-    <karaf.version>2.2.2</karaf.version>
+    <karaf.version>2.2.4</karaf.version>
     <servicemix.components.version>2011.02-SNAPSHOT</servicemix.components.version>
     <servicemix.nmr.version>${project.version}</servicemix.nmr.version>
     <servicemix.utils.version>1.5.0-SNAPSHOT</servicemix.utils.version>



Mime
View raw message