Return-Path: 
 <commits-return-18192-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 ACFA69AF2
	for <apmail-camel-commits-archive@www.apache.org>;
 Fri,  2 Dec 2011 17:15:15 +0000 (UTC)
Received: (qmail 57828 invoked by uid 500); 2 Dec 2011 17:15:14 -0000
Delivered-To: apmail-camel-commits-archive@camel.apache.org
Received: (qmail 57794 invoked by uid 500); 2 Dec 2011 17:15:14 -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 57762 invoked by uid 99); 2 Dec 2011 17:15:14 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Dec 2011 17:15:14 +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; Fri, 02 Dec 2011 17:15:13 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 28A5A23889B8
	for <commits@camel.apache.org>; Fri,  2 Dec 2011 17:14:52 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
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 -0000
To: commits@camel.apache.org
From: iocanel@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111202171452.28A5A23889B8@eris.apache.org>

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>