CAMEL-8514 camel-castor: change dep from SMX OSGi bundle to castor-xml (keeping versions). Thanks to Thomas Diesler.
This closes #441 Conflicts: parent/pom.xml Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/51cf4226 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/51cf4226 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/51cf4226 Branch: refs/heads/camel-2.14.x Commit: 51cf42260fc6e28ed4c98408b6ce0e71aa6efabb Parents: 5a4e372 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:12:28 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/51cf4226/components/camel-castor/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-castor/pom.xml b/components/camel-castor/pom.xml index e0c77ca..290eac0 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/51cf4226/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index bed6b5f..9c7e6e9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -74,6 +74,7 @@ <build-helper-maven-plugin-version>1.8</build-helper-maven-plugin-version> <c3p0-version>0.9.1.2</c3p0-version> <camel-test-spring-artifactId>camel-test-spring3</camel-test-spring-artifactId> + <castor-version>1.3.2</castor-version> <castor-bundle-version>1.3.2_2</castor-bundle-version> <cdi-api-version>1.2</cdi-api-version> <cglib-bundle-version>2.1_3_7</cglib-bundle-version> @@ -1882,6 +1883,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>