camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggrzy...@apache.org
Subject camel git commit: [CAMEL-8659] Use commons-lang 2.6 in camel-xmljson feature
Date Fri, 17 Apr 2015 12:40:16 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 8b24c95be -> fc5833ca7


[CAMEL-8659] Use commons-lang 2.6 in camel-xmljson feature

(cherry picked from commit 2207ae39e0d8cb7eee3802273406db600b6e9beb)


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fc5833ca
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fc5833ca
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fc5833ca

Branch: refs/heads/camel-2.15.x
Commit: fc5833ca7e65938d4575facddeb62dd558ca9a95
Parents: 8b24c95
Author: Grzegorz Grzybek <gr.grzybek@gmail.com>
Authored: Fri Apr 17 14:33:42 2015 +0200
Committer: Grzegorz Grzybek <gr.grzybek@gmail.com>
Committed: Fri Apr 17 14:39:49 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/fc5833ca/components/camel-xmljson/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-xmljson/pom.xml b/components/camel-xmljson/pom.xml
index 0422cfb..428a660 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/fc5833ca/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 3e8e727..8f9dfa5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -111,7 +111,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/fc5833ca/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 8aad119..57bd4ca 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1535,7 +1535,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>


Mime
View raw message