camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ioca...@apache.org
Subject svn commit: r1209590 - in /camel/trunk/platforms/karaf/features: pom.xml src/main/resources/features.xml
Date Fri, 02 Dec 2011 17:14:52 GMT
Author: iocanel
Date: Fri Dec  2 17:14:50 2011
New Revision: 1209590

URL: http://svn.apache.org/viewvc?rev=1209590&view=rev
Log:
[CAMEL-4735] Updated to camel-xstream feature to use woodstox 4.1.1 to be consistent with
cxf 2.5.0.

Modified:
    camel/trunk/platforms/karaf/features/pom.xml
    camel/trunk/platforms/karaf/features/src/main/resources/features.xml

Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1209590&r1=1209589&r2=1209590&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Fri Dec  2 17:14:50 2011
@@ -131,7 +131,7 @@
       <xpp3-bundle-version>1.1.4c_5</xpp3-bundle-version>
       <xstream-bundle-version>1.4.1_1</xstream-bundle-version>
       <werken-xpath-bundle-version>0.9.4_5</werken-xpath-bundle-version>
-      <woodstox-core-bundle-version>3.2.9_2</woodstox-core-bundle-version>
+      <woodstox-core-bundle-version>${woodstox-version}</woodstox-core-bundle-version>
       <stax2-api-bundle-version>3.1.1</stax2-api-bundle-version>
       <saaj-impl-version>1.3.2_2</saaj-impl-version>
       <wsdl4j-bundle-version>1.6.2_5</wsdl4j-bundle-version>

Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1209590&r1=1209589&r2=1209590&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Fri Dec  2 17:14:50
2011
@@ -704,7 +704,8 @@
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j-bundle-version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kxml2/${kxml2-bundle-version}</bundle>
-    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.woodstox/${woodstox-core-bundle-version}</bundle>
+    <bundle dependency="true">mvn:org.codehaus.woodstox/stax2-api/${stax2-api-bundle-version}</bundle>
+    <bundle dependency="true">mvn:org.codehaus.woodstox/woodstox-core-asl/${woodstox-core-bundle-version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-xstream/${pom.version}</bundle>
   </feature>



Mime
View raw message