You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/12/22 17:19:10 UTC
svn commit: r1222325 - in /camel/branches/camel-2.8.x: ./
platforms/karaf/features/pom.xml
platforms/karaf/features/src/main/resources/features.xml
Author: dkulp
Date: Thu Dec 22 16:19:10 2011
New Revision: 1222325
URL: http://svn.apache.org/viewvc?rev=1222325&view=rev
Log:
Merged revisions 1209576 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1209576 | iocanel | 2011-12-02 11:47:49 -0500 (Fri, 02 Dec 2011) | 1 line
[CAMEL-4735] Added woodstox bundle to camel-xstream feature.
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml?rev=1222325&r1=1222324&r2=1222325&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml Thu Dec 22 16:19:10 2011
@@ -133,7 +133,7 @@
<xmlresolver-bundle-version>1.2_4</xmlresolver-bundle-version>
<xpp3-bundle-version>1.1.4c_5</xpp3-bundle-version>
<xstream-bundle-version>1.4.1_1</xstream-bundle-version>
- <woodstox-core-bundle-version>${woodstox-version}</woodstox-core-bundle-version>
+ <woodstox-core-bundle-version>3.2.9_2</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/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml?rev=1222325&r1=1222324&r2=1222325&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml Thu Dec 22 16:19:10 2011
@@ -688,6 +688,7 @@
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime-bundle-version}</bundle>
<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.woodstox/${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/${project.version}</bundle>
</feature>