Author: ningjiang
Date: Tue Dec 28 09:50:14 2010
New Revision: 1053293
URL: http://svn.apache.org/viewvc?rev=1053293&view=rev
Log:
CAMEL-3327 update the apache-camel feature with JAXB 2.2.x
Modified:
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.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=1053293&r1=1053292&r2=1053293&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Tue Dec 28 09:50:14 2010
@@ -75,7 +75,7 @@
<irclib-bundle-version>1.10_2</irclib-bundle-version>
<isorelax-bundle-version>20050913_1</isorelax-bundle-version>
<jackrabbit-version>1.5.3</jackrabbit-version>
- <jaxb-bundle-version>2.1.13_1</jaxb-bundle-version>
+ <jaxb-bundle-version>2.2.1.1_1</jaxb-bundle-version>
<jasypt-bundle-version>1.6_1</jasypt-bundle-version>
<jetty6-bundle-version>6.1.22_1</jetty6-bundle-version>
<jexcelapi-bundle-version>2.4.2_2</jexcelapi-bundle-version>
Modified:
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml?rev=1053293&r1=1053292&r2=1053293&view=diff
==============================================================================
---
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
(original)
+++
camel/trunk/platforms/karaf/features/src/main/resources/features-spring2.xml
Tue Dec 28 09:50:14 2010
@@ -55,7 +55,7 @@
<feature name='camel-core' version='${pom.version}'>
<feature version="${spring-version}">spring</feature>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.1/${servicemix-specs-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-bundle-version}</bundle>
<bundle>mvn:org.fusesource.commonman/commons-management/${commons-management-version}</bundle>
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=1053293&r1=1053292&r2=1053293&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue
Dec 28 09:50:14 2010
@@ -58,7 +58,7 @@
<feature name='camel-core' version='${pom.version}'>
<feature version="${spring3-version}">spring</feature>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}</bundle>
-
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.1/${servicemix-specs-version}</bundle>
+
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix-specs-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-bundle-version}</bundle>
<bundle>mvn:org.fusesource.commonman/commons-management/${commons-management-version}</bundle>
