Repository: camel Updated Branches: refs/heads/master 72b351287 -> 2207ae39e
[CAMEL-8659] Use commons-lang 2.6 in camel-xmljson feature Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2207ae39 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2207ae39 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2207ae39 Branch: refs/heads/master Commit: 2207ae39e0d8cb7eee3802273406db600b6e9beb Parents: 72b3512 Author: Grzegorz Grzybek <gr.grzy...@gmail.com> Authored: Fri Apr 17 14:33:42 2015 +0200 Committer: Grzegorz Grzybek <gr.grzy...@gmail.com> Committed: Fri Apr 17 14:33:42 2015 +0200 ---------------------------------------------------------------------- components/camel-xmljson/pom.xml | 5 +++++ parent/pom.xml | 1 - platforms/karaf/features/src/main/resources/features.xml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/2207ae39/components/camel-xmljson/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-xmljson/pom.xml b/components/camel-xmljson/pom.xml index 6cea841..c0ea5de 100644 --- a/components/camel-xmljson/pom.xml +++ b/components/camel-xmljson/pom.xml @@ -46,6 +46,11 @@ <version>${jsonlib-version}</version> <classifier>jdk15</classifier> </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>${commons-lang-version}</version> + </dependency> <!-- testing --> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/2207ae39/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index f4047a3..530371f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -112,7 +112,6 @@ <commons-jexl2-version>2.1.1</commons-jexl2-version> <commons-jxpath-version>1.3</commons-jxpath-version> <commons-lang-version>2.6</commons-lang-version> - <commons-lang-version-xmljson>2.5</commons-lang-version-xmljson> <commons-lang3-version>3.3.2</commons-lang3-version> <commons-logging-version>1.1.3</commons-logging-version> <commons-math-version>2.2</commons-math-version> http://git-wip-us.apache.org/repos/asf/camel/blob/2207ae39/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index f0d647e..24bc5e2 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1542,7 +1542,7 @@ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ezmorph/${ezmorph-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.json-lib/${jsonlib-bundle-version}</bundle> - <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version-xmljson}</bundle> + <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle> <bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle> <feature version='${project.version}'>camel-core</feature> <bundle>mvn:org.apache.camel/camel-xmljson/${project.version}</bundle>
