This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 2fa9c58 Upgrade JSON-Smart to version 2.3
2fa9c58 is described below
commit 2fa9c585418203b06aab8fd8cb4437771cee479c
Author: Pascal Schumacher <pascalschumac...@gmx.net>
AuthorDate: Tue May 1 11:30:43 2018 +0200
Upgrade JSON-Smart to version 2.3
Spring Boot 2 (CAMEL-12383) uses JSON-Smart 2.3 so
cbee55a3bc1a078badcd2caed47b7e79314c8e1c can be reverted.
---
components/camel-jsonpath/pom.xml | 3 +--
parent/pom.xml | 4 +---
platforms/karaf/features/src/main/resources/features.xml | 2 +-
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/components/camel-jsonpath/pom.xml
b/components/camel-jsonpath/pom.xml
index 04e72aa..664447d 100644
--- a/components/camel-jsonpath/pom.xml
+++ b/components/camel-jsonpath/pom.xml
@@ -55,12 +55,11 @@
<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>
diff --git a/parent/pom.xml b/parent/pom.xml
index 6cc4b05..8272260 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -422,9 +422,7 @@
<json-path-version>2.4.0</json-path-version>
<json-simple-version>1.1.1</json-simple-version>
<json-simple2-version>2.2.0</json-simple2-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>
+ <json-smart-version>2.3</json-smart-version>
<jsoup-version>1.11.3</jsoup-version>
<jsoup-version>1.11.3</jsoup-version>
<jsp-api-2.1-version>1.0.1</jsp-api-2.1-version>
<jsr311-api-version>1.1.1</jsr311-api-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index d17b3db..f7c2238 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1300,7 +1300,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-karaf-version}</bundle>
+ <bundle>mvn:net.minidev/json-smart-action/${json-smart-version}</bundle>
<bundle>mvn:net.minidev/accessors-smart/${json-accessors-smart-version}</bundle>
<bundle dependency='true'>mvn:org.ow2.asm/asm/${asm-version}</bundle>
<bundle
dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
--
To stop receiving notification emails like this one, please contact
pascalschumac...@apache.org.
