camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject camel git commit: Fixed camel-jsonpath to work in spring-boot and on karaf as well.
Date Mon, 31 Jul 2017 08:01:45 GMT
Repository: camel
Updated Branches:
  refs/heads/master 705edc6f9 -> cbee55a3b


Fixed camel-jsonpath to work in spring-boot and on karaf as well.


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

Branch: refs/heads/master
Commit: cbee55a3bc1a078badcd2caed47b7e79314c8e1c
Parents: 705edc6
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Mon Jul 31 10:01:32 2017 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Mon Jul 31 10:01:39 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/cbee55a3/components/camel-jsonpath/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jsonpath/pom.xml b/components/camel-jsonpath/pom.xml
index 20fc8f6..60d4534 100644
--- a/components/camel-jsonpath/pom.xml
+++ b/components/camel-jsonpath/pom.xml
@@ -55,11 +55,12 @@
       <artifactId>json-path</artifactId>
       <version>${json-path-version}</version>
     </dependency>
+    <!-- TODO: when upgrading to json-smart to 2.3 or better
     <dependency>
       <groupId>net.minidev</groupId>
       <artifactId>json-smart-action</artifactId>
       <version>${json-smart-version}</version>
-    </dependency>
+    </dependency> -->
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>

http://git-wip-us.apache.org/repos/asf/camel/blob/cbee55a3/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index d06889f..10d8ea6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -401,7 +401,9 @@
     <json-accessors-smart-version>1.2</json-accessors-smart-version>
     <json-path-version>2.4.0</json-path-version>
     <json-simple-version>1.1.1</json-simple-version>
-    <json-smart-version>2.3</json-smart-version>
+    <!-- spring-boot uses json-smart 2.2.x -->
+    <json-smart-version>2.2.1</json-smart-version>
+    <json-smart-karaf-version>2.3</json-smart-karaf-version>
     <jsoup-version>1.9.2</jsoup-version>
     <jsp-api-2.1-version>1.0.1</jsp-api-2.1-version>
     <jsr311-api-version>1.1.1</jsr311-api-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/cbee55a3/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 03caee3..0608a40 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1169,7 +1169,7 @@
   <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>mvn:net.minidev/json-smart-action/${json-smart-version}</bundle>
+    <bundle>mvn:net.minidev/json-smart-action/${json-smart-karaf-version}</bundle>
     <bundle>mvn:net.minidev/accessors-smart/${json-accessors-smart-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>


Mime
View raw message