Author: davsclaus
Date: Sun Nov 6 16:47:21 2011
New Revision: 1198426
URL: http://svn.apache.org/viewvc?rev=1198426&view=rev
Log:
CAMEL-4628: Upgraded to jibx 1.2.3
Modified:
camel/trunk/components/camel-jibx/pom.xml
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/components/camel-jibx/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jibx/pom.xml?rev=1198426&r1=1198425&r2=1198426&view=diff
==============================================================================
--- camel/trunk/components/camel-jibx/pom.xml (original)
+++ camel/trunk/components/camel-jibx/pom.xml Sun Nov 6 16:47:21 2011
@@ -79,7 +79,7 @@
<plugin>
<groupId>org.jibx</groupId>
<artifactId>maven-jibx-plugin</artifactId>
- <version>1.2.3</version>
+ <version>${jibx-version}</version>
<configuration>
<bindingDirectory>src/test/resources</bindingDirectory>
<includeSchemaBindings>
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1198426&r1=1198425&r2=1198426&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sun Nov 6 16:47:21 2011
@@ -107,7 +107,7 @@
<jetty-version>7.5.3.v20111011</jetty-version>
<jettison-version>1.3</jettison-version>
<jexcelapi-version>2.4.2</jexcelapi-version>
- <jibx-version>1.2.2</jibx-version>
+ <jibx-version>1.2.3</jibx-version>
<jruby-version>1.6.5</jruby-version>
<jsmpp-version>2.1.0_3</jsmpp-version>
<jsch-version>0.1.44-1</jsch-version>
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1198426&r1=1198425&r2=1198426&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Sun Nov 6 16:47:21 2011
@@ -89,7 +89,6 @@
<jdom-bundle-version>1.1_3</jdom-bundle-version>
<jettison-bundle-version>1.3</jettison-bundle-version>
<jing-bundle-version>20030619_1</jing-bundle-version>
- <jibx-bundle-version>1.2.2_1</jibx-bundle-version>
<jodatime-bundle-version>1.5.2_2</jodatime-bundle-version>
<josql-bundle-version>1.5_3</josql-bundle-version>
<jsch-bundle-version>0.1.44_1</jsch-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=1198426&r1=1198425&r2=1198426&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Sun Nov 6 16:47:21 2011
@@ -366,7 +366,7 @@
<feature name='camel-jibx' version='${pom.version}' resolver='(obr)' start-level='50'>
<feature version='${pom.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-jibx/${pom.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jibx/${jibx-bundle-version}</bundle>
+ <bundle dependency="true">mvn:org.jibx/jibx-run/${jibx-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime-bundle-version}</bundle>