From commits-return-16476-apmail-camel-commits-archive=camel.apache.org@camel.apache.org  Tue Aug  9 11:44:38 2011
Return-Path: <commits-return-16476-apmail-camel-commits-archive=camel.apache.org@camel.apache.org>
X-Original-To: apmail-camel-commits-archive@www.apache.org
Delivered-To: apmail-camel-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id EA3B278CC
	for <apmail-camel-commits-archive@www.apache.org>; Tue,  9 Aug 2011 11:44:38 +0000 (UTC)
Received: (qmail 50532 invoked by uid 500); 9 Aug 2011 11:44:38 -0000
Delivered-To: apmail-camel-commits-archive@camel.apache.org
Received: (qmail 50455 invoked by uid 500); 9 Aug 2011 11:44:35 -0000
Mailing-List: contact commits-help@camel.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@camel.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@camel.apache.org>
List-Post: <mailto:commits@camel.apache.org>
List-Id: <commits.camel.apache.org>
Reply-To: dev@camel.apache.org
Delivered-To: mailing list commits@camel.apache.org
Received: (qmail 50428 invoked by uid 99); 9 Aug 2011 11:44:32 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Aug 2011 11:44:32 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Aug 2011 11:44:28 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 425B623889ED
	for <commits@camel.apache.org>; Tue,  9 Aug 2011 11:44:08 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1155319 - in /camel/trunk: parent/pom.xml
 platforms/karaf/features/pom.xml
 platforms/karaf/features/src/main/resources/features.xml
Date: Tue, 09 Aug 2011 11:44:07 -0000
To: commits@camel.apache.org
From: jbonofre@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110809114408.425B623889ED@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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 @@
     <velocity-version>1.7</velocity-version>
     <woodstox-version>4.1.1</woodstox-version>
     <xbean-spring-version>3.5</xbean-spring-version>
-    <xstream-version>1.3.1</xstream-version>
+    <xstream-version>1.4</xstream-version>
     <xmlsec-version>1.4.5</xmlsec-version>
     <xerces-version>2.9.1</xerces-version>
     <xalan-version>2.7.1</xalan-version>

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 @@
       <juel-bundle-version>2.1.2_1</juel-bundle-version>
       <junit-bundle-version>4.7_1</junit-bundle-version>
       <jsmpp-bundle-version>2.1.0_1</jsmpp-bundle-version>
+      <kxml2-bundle-version>2.3.0_1-SNAPSHOT</kxml2-bundle-version>
       <lucene-bundle-version>3.0.3_1</lucene-bundle-version>
       <mvel-bundle-version>2.0.8_4</mvel-bundle-version>
       <mina-bundle-version>1.1.7_3</mina-bundle-version>
@@ -137,7 +138,7 @@
       <xmlsec-bundle-version>1.4.5_1</xmlsec-bundle-version>
       <xmlresolver-bundle-version>1.2_3</xmlresolver-bundle-version>
       <xpp3-bundle-version>1.1.4c_3</xpp3-bundle-version>
-      <xstream-bundle-version>1.3_3</xstream-bundle-version>
+      <xstream-bundle-version>1.4_1-SNAPSHOT</xstream-bundle-version>
       <werken-xpath-bundle-version>0.9.4_3</werken-xpath-bundle-version>
       <woodstox-core-bundle-version>${woodstox-version}</woodstox-core-bundle-version>
       <stax2-api-bundle-version>3.1.1</stax2-api-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=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 @@
     <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.kxml2/${kxml2-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>