You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ra...@apache.org on 2015/03/19 15:13:02 UTC
[3/4] camel git commit: CAMEL-8514 camel-castor: change dep from SMX
OSGi bundle to castor-xml (keeping versions). Thanks to Thomas Diesler.
CAMEL-8514 camel-castor: change dep from SMX OSGi bundle to castor-xml (keeping versions). Thanks to Thomas Diesler.
This closes #441
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f8d1d999
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f8d1d999
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f8d1d999
Branch: refs/heads/master
Commit: f8d1d999f4b2a251979f647e55e4f9d604117598
Parents: 2144590
Author: Raul Kripalani <ra...@apache.org>
Authored: Thu Mar 19 14:05:39 2015 +0000
Committer: Raul Kripalani <ra...@apache.org>
Committed: Thu Mar 19 14:09:37 2015 +0000
----------------------------------------------------------------------
components/camel-castor/pom.xml | 4 ++--
parent/pom.xml | 6 ++++++
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f8d1d999/components/camel-castor/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-castor/pom.xml b/components/camel-castor/pom.xml
index 2fb143a..ce831bf 100644
--- a/components/camel-castor/pom.xml
+++ b/components/camel-castor/pom.xml
@@ -42,8 +42,8 @@
<artifactId>camel-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.castor</artifactId>
+ <groupId>org.codehaus.castor</groupId>
+ <artifactId>castor-xml</artifactId>
</dependency>
<!-- testing -->
http://git-wip-us.apache.org/repos/asf/camel/blob/f8d1d999/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 557819f..7852cd6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -82,6 +82,7 @@
<cassandra-driver-guava-version>16.0.1</cassandra-driver-guava-version>
<cassandra-version>2.1.2</cassandra-version>
<cassandra-unit-version>2.0.2.2</cassandra-unit-version>
+ <castor-version>1.3.2</castor-version>
<castor-bundle-version>1.3.2_2</castor-bundle-version>
<cdi-api-version>1.0</cdi-api-version>
<cglib-bundle-version>2.1_3_7</cglib-bundle-version>
@@ -2109,6 +2110,11 @@
<!-- optional castor dependencies -->
<dependency>
+ <groupId>org.codehaus.castor</groupId>
+ <artifactId>castor-xml</artifactId>
+ <version>${castor-version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.castor</artifactId>
<version>${castor-bundle-version}</version>