servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1199116 - in /servicemix/smx4/features/trunk: assemblies/apache-servicemix/src/main/filtered-resources/features.xml parent/pom.xml pom.xml
Date Tue, 08 Nov 2011 05:47:27 GMT
Author: ffang
Date: Tue Nov  8 05:47:26 2011
New Revision: 1199116

URL: http://svn.apache.org/viewvc?rev=1199116&view=rev
Log:
[SMX4-916]upgrade to cxf 2.4.4

Modified:
    servicemix/smx4/features/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
    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=1199116&r1=1199115&r2=1199116&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
Tue Nov  8 05:47:26 2011
@@ -22,11 +22,6 @@
     <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>
@@ -39,11 +34,6 @@
         <bundle dependency="true">mvn:org.springframework/spring-context/${spring.version}</bundle>
                                      ‚
         <bundle dependency="true">mvn:org.springframework/spring-aop/${spring.version}</bundle>
     </feature>
-    <feature name="saaj" version="${saaj-impl.bundle.version}"  resolver='(obr)'>
-        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${saaj-impl.bundle.version}</bundle>
-        <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
-    </feature>
 
     <feature name="cxf-osgi" version="${version}" resolver="(obr)" start-level='50'>
         <feature version="${cxf.version}">cxf</feature>
@@ -138,7 +128,6 @@
     </feature>
     <feature name="examples-cxf-ws-security-osgi" version="${version}" resolver="(obr)">
         <feature>cxf-osgi</feature>
-        <feature version="${saaj-impl.bundle.version}">saaj</feature> 
         <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix/servicemix-utils/${servicemix.utils.version}</bundle>
         <bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>

Modified: servicemix/smx4/features/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/parent/pom.xml?rev=1199116&r1=1199115&r2=1199116&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/parent/pom.xml (original)
+++ servicemix/smx4/features/trunk/parent/pom.xml Tue Nov  8 05:47:26 2011
@@ -39,7 +39,7 @@
   <properties>
     <activemq.version>5.5.0</activemq.version>
     <camel.version>2.8.3-SNAPSHOT</camel.version>
-    <cxf.version>2.4.4-SNAPSHOT</cxf.version>
+    <cxf.version>2.4.4</cxf.version>
 
     <felix.obr.version>1.6.4</felix.obr.version>
 
@@ -47,7 +47,7 @@
 
     <servicemix.components.version>2011.02-SNAPSHOT</servicemix.components.version>
     <servicemix.nmr.version>1.5.0-SNAPSHOT</servicemix.nmr.version>
-    <servicemix.specs.version>1.8.0</servicemix.specs.version>
+    <servicemix.specs.version>1.9.0</servicemix.specs.version>
     <servicemix.utils.version>1.5.0-SNAPSHOT</servicemix.utils.version>
   </properties>
 

Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1199116&r1=1199115&r2=1199116&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Tue Nov  8 05:47:26 2011
@@ -161,7 +161,7 @@
         <propertyset.bundle.version>1.3_4</propertyset.bundle.version>
         <quartz.bundle.version>1.8.5_1</quartz.bundle.version>
         <rhino.bundle.version>1.7R1_3</rhino.bundle.version>
-        <saaj-impl.bundle.version>1.3.2_2</saaj-impl.bundle.version>
+        <saaj-impl.bundle.version>1.3.9_2</saaj-impl.bundle.version>
         <saxon.bundle.version>9.1.0.8_1</saxon.bundle.version>
         <snmp4j.bundle.version>1.8.1_4</snmp4j.bundle.version>
         <velocity.bundle.version>1.7_1</velocity.bundle.version>



Mime
View raw message