Author: cmueller Date: Wed Jun 27 21:04:13 2012 New Revision: 1354724 URL: http://svn.apache.org/viewvc?rev=1354724&view=rev Log: Update to latest jibx that has all deps in Central.
Modified: camel/branches/camel-2.9.x/components/camel-jibx/pom.xml camel/branches/camel-2.9.x/parent/pom.xml camel/branches/camel-2.9.x/platforms/karaf/features/pom.xml camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml Modified: camel/branches/camel-2.9.x/components/camel-jibx/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-jibx/pom.xml?rev=1354724&r1=1354723&r2=1354724&view=diff ============================================================================== --- camel/branches/camel-2.9.x/components/camel-jibx/pom.xml (original) +++ camel/branches/camel-2.9.x/components/camel-jibx/pom.xml Wed Jun 27 21:04:13 2012 @@ -81,14 +81,13 @@ <artifactId>maven-jibx-plugin</artifactId> <version>${jibx-version}</version> <configuration> - <bindingDirectory>src/test/resources</bindingDirectory> - <includeSchemaBindings> - <includeSchemaBinding>**/*-jibx.xml</includeSchemaBinding> - </includeSchemaBindings> + <directory>${basedir}/src/test/resources/org/apache/camel/dataformat/jibx/</directory> + <includes> + <include>purchaseOrder-jibx.xml</include> + </includes> </configuration> <executions> <execution> - <phase>process-test-classes</phase> <goals> <goal>test-bind</goal> </goals> Modified: camel/branches/camel-2.9.x/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/parent/pom.xml?rev=1354724&r1=1354723&r2=1354724&view=diff ============================================================================== --- camel/branches/camel-2.9.x/parent/pom.xml (original) +++ camel/branches/camel-2.9.x/parent/pom.xml Wed Jun 27 21:04:13 2012 @@ -106,7 +106,7 @@ <jetty-version>7.5.4.v20111024</jetty-version> <jettison-version>1.3</jettison-version> <jexcelapi-version>2.4.2</jexcelapi-version> - <jibx-version>1.2.3</jibx-version> + <jibx-version>1.2.4.5</jibx-version> <jruby-version>1.6.7</jruby-version> <jsmpp-version>2.1.0_3</jsmpp-version> <jsch-version>0.1.44-1</jsch-version> Modified: camel/branches/camel-2.9.x/platforms/karaf/features/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/platforms/karaf/features/pom.xml?rev=1354724&r1=1354723&r2=1354724&view=diff ============================================================================== --- camel/branches/camel-2.9.x/platforms/karaf/features/pom.xml (original) +++ camel/branches/camel-2.9.x/platforms/karaf/features/pom.xml Wed Jun 27 21:04:13 2012 @@ -83,6 +83,7 @@ <jettison-bundle-version>1.3</jettison-bundle-version> <jing-bundle-version>20030619_5</jing-bundle-version> <jodatime-bundle-version>1.6.2</jodatime-bundle-version> + <jodatime2-bundle-version>2.1</jodatime2-bundle-version> <josql-bundle-version>1.5_5</josql-bundle-version> <jsch-bundle-version>0.1.44_2</jsch-bundle-version> <jsendnsca-bundle-version>1.3.1_3</jsendnsca-bundle-version> Modified: camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml?rev=1354724&r1=1354723&r2=1354724&view=diff ============================================================================== --- camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml (original) +++ camel/branches/camel-2.9.x/platforms/karaf/features/src/main/resources/features.xml Wed Jun 27 21:04:13 2012 @@ -398,7 +398,7 @@ <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:joda-time/joda-time/${jodatime-bundle-version}</bundle> + <bundle dependency="true">mvn:joda-time/joda-time/${jodatime2-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> </feature>