Author: jbonofre Date: Tue Aug 9 11:44:07 2011 New Revision: 1155319 URL: http://svn.apache.org/viewvc?rev=1155319&view=rev Log: [CAMEL-4313] Upgrade to XStream 1.4 Modified: camel/trunk/parent/pom.xml camel/trunk/platforms/karaf/features/pom.xml camel/trunk/platforms/karaf/features/src/main/resources/features.xml Modified: camel/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1155319&r1=1155318&r2=1155319&view=diff ============================================================================== --- camel/trunk/parent/pom.xml (original) +++ camel/trunk/parent/pom.xml Tue Aug 9 11:44:07 2011 @@ -153,7 +153,7 @@ 1.7 4.1.1 3.5 - 1.3.1 + 1.4 1.4.5 2.9.1 2.7.1 Modified: camel/trunk/platforms/karaf/features/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1155319&r1=1155318&r2=1155319&view=diff ============================================================================== --- camel/trunk/platforms/karaf/features/pom.xml (original) +++ camel/trunk/platforms/karaf/features/pom.xml Tue Aug 9 11:44:07 2011 @@ -100,6 +100,7 @@ 2.1.2_1 4.7_1 2.1.0_1 + 2.3.0_1-SNAPSHOT 3.0.3_1 2.0.8_4 1.1.7_3 @@ -137,7 +138,7 @@ 1.4.5_1 1.2_3 1.1.4c_3 - 1.3_3 + 1.4_1-SNAPSHOT 0.9.4_3 ${woodstox-version} 3.1.1 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=1155319&r1=1155318&r2=1155319&view=diff ============================================================================== --- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original) +++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue Aug 9 11:44:07 2011 @@ -704,6 +704,7 @@ mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j-bundle-version} + mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kxml2/${kxml2-bundle-version} mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream-bundle-version} mvn:org.apache.camel/camel-xstream/${pom.version}