servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r1188132 - in /servicemix/smx4/features/trunk: ./ assemblies/apache-servicemix/src/main/filtered-resources/ examples/itests/tests/ examples/itests/tests/src/test/java/org/apache/servicemix/examples/ parent/
Date Mon, 24 Oct 2011 12:52:10 GMT
Author: gertv
Date: Mon Oct 24 12:52:09 2011
New Revision: 1188132

URL: http://svn.apache.org/viewvc?rev=1188132&view=rev
Log:
SMX4-880: Roll back to Karaf 2.2.2 and CXF 2.4.2 to prepare for release

Modified:
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
    servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
    servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
    servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
    servicemix/smx4/features/trunk/parent/pom.xml
    servicemix/smx4/features/trunk/pom.xml

Modified: servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml?rev=1188132&r1=1188131&r2=1188132&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
(original)
+++ servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
Mon Oct 24 12:52:09 2011
@@ -22,6 +22,12 @@
     <repository>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</repository>
     <repository>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</repository>
 
+    <!-- override saaj-impl feature to avoid typo in CXF 2.4.2 descriptor - delete this
as soon as we move to CXF 2.4.3 -->
+    <feature name="saaj-impl" version="1.3.2" resolver="(obr)">
+      <bundle start-level="25">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${saaj-impl.bundle.version}</bundle>
+      <bundle start-level="25">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxp-ri/${jaxp-ri.bundle.version}</bundle>
+    </feature>
+
     <feature name="connector" version="${version}" resolver="(obr)" start-level='50'>
         <feature version="${aries.version}">transaction</feature>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo-j2ee-connector.version}</bundle>

Modified: servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/pom.xml?rev=1188132&r1=1188131&r2=1188132&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/pom.xml Mon Oct 24 12:52:09 2011
@@ -64,8 +64,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.karaf.management</groupId>
-            <artifactId>org.apache.karaf.management.server</artifactId>
+            <groupId>org.apache.karaf</groupId>
+            <artifactId>org.apache.karaf.management</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java?rev=1188132&r1=1188131&r2=1188132&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
(original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
Mon Oct 24 12:52:09 2011
@@ -110,9 +110,7 @@ public class CXFNMRIntegrationTest exten
             getBundle("org.ops4j.pax.web", "pax-web-extender-whiteboard"),
             getBundle("org.apache.servicemix", "servicemix-utils"),
             getBundle("org.fusesource.commonman", "commons-management"),
-            getBundle("org.apache.karaf.jaas", "org.apache.karaf.jaas.boot"),
-            getBundle("org.apache.karaf.jaas", "org.apache.karaf.jaas.config"),
-            getBundle("org.apache.karaf.management", "org.apache.karaf.management.server"),
+            getBundle("org.apache.karaf", "org.apache.karaf.management"),
             getBundle("org.apache.cxf", "cxf-bundle"),
             getBundle("org.apache.servicemix.cxf", "org.apache.servicemix.cxf.transport.nmr"),
             getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.api"),

Modified: servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java?rev=1188132&r1=1188131&r2=1188132&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
(original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
Mon Oct 24 12:52:09 2011
@@ -146,9 +146,7 @@ public class IntegrationTest extends Abs
             getBundle("org.ops4j.pax.web", "pax-web-extender-whiteboard"),
             getBundle("org.apache.servicemix", "servicemix-utils"),
             getBundle("org.fusesource.commonman", "commons-management"),
-            getBundle("org.apache.karaf.jaas", "org.apache.karaf.jaas.boot"),
-            getBundle("org.apache.karaf.jaas", "org.apache.karaf.jaas.config"),
-            getBundle("org.apache.karaf.management", "org.apache.karaf.management.server"),
+            getBundle("org.apache.karaf", "org.apache.karaf.management"),
             getBundle("org.apache.cxf", "cxf-bundle"),
             getBundle("org.apache.servicemix.cxf", "org.apache.servicemix.cxf.transport.nmr"),
             getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.api"),

Modified: servicemix/smx4/features/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/parent/pom.xml?rev=1188132&r1=1188131&r2=1188132&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/parent/pom.xml (original)
+++ servicemix/smx4/features/trunk/parent/pom.xml Mon Oct 24 12:52:09 2011
@@ -38,12 +38,12 @@
   <!-- Properties -->
   <properties>
     <activemq.version>5.5.0</activemq.version>
-    <camel.version>2.8.2-SNAPSHOT</camel.version>
+    <camel.version>2.8.1</camel.version>
     <cxf.version>2.4.2</cxf.version>
 
     <felix.obr.version>1.6.4</felix.obr.version>
 
-    <karaf.version>2.2.4</karaf.version>
+    <karaf.version>2.2.2</karaf.version>
 
     <servicemix.components.version>2011.02-SNAPSHOT</servicemix.components.version>
     <servicemix.nmr.version>1.5.0-SNAPSHOT</servicemix.nmr.version>

Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1188132&r1=1188131&r2=1188132&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Mon Oct 24 12:52:09 2011
@@ -144,7 +144,8 @@
         <drools.bundle.version>5.1.1_1</drools.bundle.version>
         <fastinfoset.bundle.version>1.2.7_3</fastinfoset.bundle.version>
         <jaxb.api.version>2.2</jaxb.api.version>
-        <jaxb-impl.bundle.version>2.2.1.1_1</jaxb-impl.bundle.version> 
+        <jaxb-impl.bundle.version>2.2.1.1_1</jaxb-impl.bundle.version>
+        <jaxp-ri.bundle.version>1.4.4_2</jaxp-ri.bundle.version>
         <jdt-core.bundle.version>3.2.3_4</jdt-core.bundle.version>
         <jdom.bundle.version>1.1_3</jdom.bundle.version>
         <jetty6.bundle.version>6.1.26_1</jetty6.bundle.version>
@@ -179,7 +180,7 @@
 
         <!-- Maven Plugins -->
         <depends-maven-plugin.version>1.2</depends-maven-plugin.version>
-        <jbi-maven-plugin.version>4.4</jbi-maven-plugin.version>
+        <jbi-maven-plugin.version>4.5</jbi-maven-plugin.version>
         <maven-antrun-plugin.version>1.6</maven-antrun-plugin.version>
         <maven-assembly-plugin.version>2.2.1</maven-assembly-plugin.version>
         <maven-bundle-plugin.version>2.1.0</maven-bundle-plugin.version>
@@ -201,7 +202,7 @@
         <jettison.version>1.2</jettison.version>
         <lingo.version>1.3</lingo.version>
         <scriptengines.version>1.1</scriptengines.version>
-        <spring.version>3.0.6.RELEASE</spring.version>
+        <spring.version>3.0.5.RELEASE</spring.version>
         <spring.osgi.version>1.2.1</spring.osgi.version>
         <wss4j.version>1.6.1</wss4j.version>
         <neethi.version>3.0.0</neethi.version>



Mime
View raw message