Author: dkulp
Date: Mon Jun 25 16:51:44 2012
New Revision: 1353651
URL: http://svn.apache.org/viewvc?rev=1353651&view=rev
Log:
Update to latest jibx that has all deps in Central.
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=1353651&r1=1353650&r2=1353651&view=diff
==============================================================================
--- camel/trunk/components/camel-jibx/pom.xml (original)
+++ camel/trunk/components/camel-jibx/pom.xml Mon Jun 25 16:51:44 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/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1353651&r1=1353650&r2=1353651&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Mon Jun 25 16:51:44 2012
@@ -117,7 +117,7 @@
<jetty-version>7.5.4.v20111024</jetty-version>
<jettison-version>1.3.1</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_4</jsmpp-version>
<jsch-version>0.1.48</jsch-version>
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1353651&r1=1353650&r2=1353651&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Mon Jun 25 16:51:44 2012
@@ -85,6 +85,7 @@
<jdom-bundle-version>1.1_4</jdom-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.48_1</jsch-bundle-version>
<jsendnsca-bundle-version>1.3.1_3</jsendnsca-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=1353651&r1=1353650&r2=1353651&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Mon
Jun 25 16:51:44 2012
@@ -476,7 +476,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>
