You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/11/14 21:07:38 UTC
svn commit: r1201862 - in /camel/branches/camel-2.8.x: ./
components/camel-jibx/pom.xml parent/pom.xml platforms/karaf/features/pom.xml
platforms/karaf/features/src/main/resources/features.xml
Author: dkulp
Date: Mon Nov 14 20:07:38 2011
New Revision: 1201862
URL: http://svn.apache.org/viewvc?rev=1201862&view=rev
Log:
Merged revisions 1198426 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1198426 | davsclaus | 2011-11-06 11:47:21 -0500 (Sun, 06 Nov 2011) | 1 line
CAMEL-4628: Upgraded to jibx 1.2.3
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-jibx/pom.xml
camel/branches/camel-2.8.x/parent/pom.xml
camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml
camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/components/camel-jibx/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-jibx/pom.xml?rev=1201862&r1=1201861&r2=1201862&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-jibx/pom.xml (original)
+++ camel/branches/camel-2.8.x/components/camel-jibx/pom.xml Mon Nov 14 20:07:38 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/branches/camel-2.8.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/parent/pom.xml?rev=1201862&r1=1201861&r2=1201862&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/parent/pom.xml (original)
+++ camel/branches/camel-2.8.x/parent/pom.xml Mon Nov 14 20:07:38 2011
@@ -106,7 +106,7 @@
<jetty-version>7.4.5.v20110725</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.5.6</jruby-version>
<jsmpp-version>2.1.0_3</jsmpp-version>
<jsch-version>0.1.44-1</jsch-version>
Modified: camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml?rev=1201862&r1=1201861&r2=1201862&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml Mon Nov 14 20:07:38 2011
@@ -89,7 +89,6 @@
<jcr-bundle-version>1.0_2</jcr-bundle-version>
<jdom-bundle-version>1.1_4</jdom-bundle-version>
<jettison-bundle-version>1.3</jettison-bundle-version>
- <jibx-bundle-version>1.2.2_1</jibx-bundle-version>
<jing-bundle-version>20030619_4</jing-bundle-version>
<jodatime-bundle-version>1.5.2_2</jodatime-bundle-version>
<josql-bundle-version>1.5_5</josql-bundle-version>
Modified: camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml?rev=1201862&r1=1201861&r2=1201862&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/branches/camel-2.8.x/platforms/karaf/features/src/main/resources/features.xml Mon Nov 14 20:07:38 2011
@@ -347,7 +347,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>