Repository: camel
Updated Branches:
  refs/heads/master b2862c147 -> 1eb932eee


Upgrade jsonpath to latest release


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

Branch: refs/heads/master
Commit: 1eb932eee4f1bd75b8a80dd25565ff3e516df12d
Parents: b2862c1
Author: Claus Ibsen <[email protected]>
Authored: Fri Jan 30 06:40:32 2015 +0100
Committer: Claus Ibsen <[email protected]>
Committed: Fri Jan 30 06:40:40 2015 +0100

----------------------------------------------------------------------
 components/camel-jsonpath/pom.xml                        | 5 +++++
 parent/pom.xml                                           | 5 +++--
 platforms/karaf/features/src/main/resources/features.xml | 8 +++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/1eb932ee/components/camel-jsonpath/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jsonpath/pom.xml 
b/components/camel-jsonpath/pom.xml
index ac3d831..17b3f7e 100644
--- a/components/camel-jsonpath/pom.xml
+++ b/components/camel-jsonpath/pom.xml
@@ -47,6 +47,11 @@
       <artifactId>json-path</artifactId>
       <version>${json-path-version}</version>
     </dependency>
+    <dependency>
+      <groupId>net.minidev</groupId>
+      <artifactId>json-smart</artifactId>
+      <version>${json-smart-version}</version>
+    </dependency>
 
     <!-- testing -->
     <dependency>

http://git-wip-us.apache.org/repos/asf/camel/blob/1eb932ee/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 522a678..64246bb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -276,8 +276,9 @@
     <jsonlib-bundle-version>2.4_1</jsonlib-bundle-version>
     <jsonlib-version>2.4</jsonlib-version>
     <json4s-bundle-version>3.2.8_1</json4s-bundle-version>
-    <json-path-version>1.1.0</json-path-version>
-    <json-smart-version>2.0</json-smart-version>
+    <json-asm-version>1.0.2</json-asm-version>
+    <json-path-version>1.2.0</json-path-version>
+    <json-smart-version>2.1.1</json-smart-version>
     <jsp-api-2.1-version>1.0.1</jsp-api-2.1-version>
     <jsr311-api-version>1.1.1</jsr311-api-version>
     <jsmpp-bundle-version>2.1.0_4</jsmpp-bundle-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/1eb932ee/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 7a05ad0..d09db72 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -821,7 +821,13 @@
   <feature name='camel-jsonpath' version='${project.version}' resolver='(obr)' 
start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <bundle>mvn:com.jayway.jsonpath/json-path/${json-path-version}</bundle>
-    <bundle>wrap:mvn:net.minidev/json-smart/${json-smart-version}</bundle>
+    <bundle>mvn:net.minidev/json-smart/${json-smart-version}</bundle>
+    <bundle>mvn:net.minidev/asm/${json-asm-version}</bundle>
+    <!-- should be optional: 
https://code.google.com/p/json-path/issues/detail?id=66 -->
+    <bundle 
dependency='true'>mvn:com.google.code.gson/gson/${gson-version}</bundle>
+    <bundle 
dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
+    <bundle 
dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
+    <bundle 
dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-jsonpath/${project.version}</bundle>
   </feature>
   <feature name='camel-jt400' version='${project.version}' resolver='(obr)' 
start-level='50'>

Reply via email to