You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/07/19 13:32:43 UTC
camel git commit: Upgrade jsonpath to version 2.4
Repository: camel
Updated Branches:
refs/heads/master 431c3198d -> 4cdb8f573
Upgrade jsonpath to version 2.4
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4cdb8f57
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4cdb8f57
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4cdb8f57
Branch: refs/heads/master
Commit: 4cdb8f573a8a8e4fe5b19a7c8b36edb96fc25524
Parents: 431c319
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jul 19 15:31:48 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jul 19 15:32:35 2017 +0200
----------------------------------------------------------------------
components/camel-jsonpath/pom.xml | 2 +-
parent/pom.xml | 7 +++----
platforms/karaf/features/src/main/resources/features.xml | 6 ++----
3 files changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4cdb8f57/components/camel-jsonpath/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-jsonpath/pom.xml b/components/camel-jsonpath/pom.xml
index 28ed96b..20fc8f6 100644
--- a/components/camel-jsonpath/pom.xml
+++ b/components/camel-jsonpath/pom.xml
@@ -57,7 +57,7 @@
</dependency>
<dependency>
<groupId>net.minidev</groupId>
- <artifactId>json-smart</artifactId>
+ <artifactId>json-smart-action</artifactId>
<version>${json-smart-version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/4cdb8f57/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index a4e1d22..d4e6df9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -398,11 +398,10 @@
<jsonlib-version>2.4</jsonlib-version>
<json4s-bundle-version>3.2.8_1</json4s-bundle-version>
<json-asm-version>1.0.2</json-asm-version>
- <json-accessors-smart-version>1.1</json-accessors-smart-version>
- <!-- json-path 2.2.0 has OSGi bug: https://github.com/jayway/JsonPath/issues/208 -->
- <json-path-version>2.1.0</json-path-version>
+ <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.2.1</json-smart-version>
+ <json-smart-version>2.3</json-smart-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/4cdb8f57/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 bb0d499..c32f670 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -358,7 +358,7 @@
<feature name='camel-chunk' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
- <bundle dependency='true'>mvn:net.minidev/json-smart/${json-smart-version}</bundle>
+ <bundle dependency='true'>mvn:net.minidev/json-smart-action/${json-smart-version}</bundle>
<bundle dependency='true'>mvn:net.minidev/accessors-smart/${json-accessors-smart-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.chunk-templates/${chunk-templates-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-chunk/${project.version}</bundle>
@@ -1177,10 +1177,8 @@
<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/${json-smart-version}</bundle>
+ <bundle>mvn:net.minidev/json-smart-action/${json-smart-version}</bundle>
<bundle>mvn:net.minidev/accessors-smart/${json-accessors-smart-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>