This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 68c6143d8077b41a85f1dc57865f16a2576c2053
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Jun 3 06:31:50 2021 +0200

    Upgrade to json-path 2.6.0
---
 camel-dependencies/pom.xml                         |  2 +-
 .../camel/catalog/docs/jsonpath-language.adoc      | 27 +++-------------------
 .../src/main/docs/jsonpath-language.adoc           | 27 +++-------------------
 .../modules/languages/pages/jsonpath-language.adoc | 27 +++-------------------
 parent/pom.xml                                     |  2 +-
 5 files changed, 11 insertions(+), 74 deletions(-)

diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index d958fd0..2eb6f7e 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -351,7 +351,7 @@
     <jslt-version>0.1.11</jslt-version>
     <jsmpp-version>2.3.11</jsmpp-version>
     <json-api>1.0</json-api>
-    <json-path-version>2.4.0</json-path-version>
+    <json-path-version>2.6.0</json-path-version>
     <json-schema-validator-version>2.2.14</json-schema-validator-version>
     <json-simple-version>1.1.1</json-simple-version>
     <jsonassert-version>1.5.0</jsonassert-version>
diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jsonpath-language.adoc
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jsonpath-language.adoc
index 84d27e6..7bd71e9 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jsonpath-language.adoc
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jsonpath-language.adoc
@@ -14,7 +14,7 @@ using Expression or Predicate
 on json messages.
 
 [source,java]
------------------------------------------------------
+----
 from("queue:books.new")
   .choice()
     .when().jsonpath("$.store.book[?(@.price < 10)]")
@@ -22,8 +22,8 @@ from("queue:books.new")
     .when().jsonpath("$.store.book[?(@.price < 30)]")
       .to("jms:queue:book.average")
     .otherwise()
-      .to("jms:queue:book.expensive")
------------------------------------------------------
+      .to("jms:queue:book.expensive");
+----
 
 == JSonPath Options
 
@@ -83,9 +83,6 @@ follows
 See the https://github.com/json-path/JsonPath[JSonPath] project page for
 further examples.
 
-WARNING: The `concat` function in 
https://github.com/json-path/JsonPath[JSonPath] has a 
https://issues.apache.org/jira/browse/CAMEL-16393[bug] and does not work. Do 
not use this function.
-You can instead store information in Camel exchange properties or headers and 
then concat those together afterwards using Camel's simple language.
-
 == Easy Syntax
 
 *Since Camel 2.19*
@@ -329,22 +326,4 @@ The same example in XML DSL would be:
 </route>
 ----
 
-== Dependencies
-
-To use JSonPath in your camel routes you need to add the a dependency on
-*camel-jsonpath* which implements the JSonPath language.
-
-If you use maven you could just add the following to your pom.xml,
-substituting the version number for the latest & greatest release (see
-the download page for the latest versions).
-
-[source,xml]
-----
-<dependency>
-  <groupId>org.apache.camel</groupId>
-  <artifactId>camel-jsonpath</artifactId>
-  <version>x.x.x</version>
-</dependency>
-----
-
 
include::{page-component-version}@camel-spring-boot::page$jsonpath-starter.adoc[]
diff --git a/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc 
b/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc
index 84d27e6..7bd71e9 100644
--- a/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc
+++ b/components/camel-jsonpath/src/main/docs/jsonpath-language.adoc
@@ -14,7 +14,7 @@ using Expression or Predicate
 on json messages.
 
 [source,java]
------------------------------------------------------
+----
 from("queue:books.new")
   .choice()
     .when().jsonpath("$.store.book[?(@.price < 10)]")
@@ -22,8 +22,8 @@ from("queue:books.new")
     .when().jsonpath("$.store.book[?(@.price < 30)]")
       .to("jms:queue:book.average")
     .otherwise()
-      .to("jms:queue:book.expensive")
------------------------------------------------------
+      .to("jms:queue:book.expensive");
+----
 
 == JSonPath Options
 
@@ -83,9 +83,6 @@ follows
 See the https://github.com/json-path/JsonPath[JSonPath] project page for
 further examples.
 
-WARNING: The `concat` function in 
https://github.com/json-path/JsonPath[JSonPath] has a 
https://issues.apache.org/jira/browse/CAMEL-16393[bug] and does not work. Do 
not use this function.
-You can instead store information in Camel exchange properties or headers and 
then concat those together afterwards using Camel's simple language.
-
 == Easy Syntax
 
 *Since Camel 2.19*
@@ -329,22 +326,4 @@ The same example in XML DSL would be:
 </route>
 ----
 
-== Dependencies
-
-To use JSonPath in your camel routes you need to add the a dependency on
-*camel-jsonpath* which implements the JSonPath language.
-
-If you use maven you could just add the following to your pom.xml,
-substituting the version number for the latest & greatest release (see
-the download page for the latest versions).
-
-[source,xml]
-----
-<dependency>
-  <groupId>org.apache.camel</groupId>
-  <artifactId>camel-jsonpath</artifactId>
-  <version>x.x.x</version>
-</dependency>
-----
-
 
include::{page-component-version}@camel-spring-boot::page$jsonpath-starter.adoc[]
diff --git a/docs/components/modules/languages/pages/jsonpath-language.adoc 
b/docs/components/modules/languages/pages/jsonpath-language.adoc
index 4921857..54cf0ea 100644
--- a/docs/components/modules/languages/pages/jsonpath-language.adoc
+++ b/docs/components/modules/languages/pages/jsonpath-language.adoc
@@ -16,7 +16,7 @@ using Expression or Predicate
 on json messages.
 
 [source,java]
------------------------------------------------------
+----
 from("queue:books.new")
   .choice()
     .when().jsonpath("$.store.book[?(@.price < 10)]")
@@ -24,8 +24,8 @@ from("queue:books.new")
     .when().jsonpath("$.store.book[?(@.price < 30)]")
       .to("jms:queue:book.average")
     .otherwise()
-      .to("jms:queue:book.expensive")
------------------------------------------------------
+      .to("jms:queue:book.expensive");
+----
 
 == JSonPath Options
 
@@ -85,9 +85,6 @@ follows
 See the https://github.com/json-path/JsonPath[JSonPath] project page for
 further examples.
 
-WARNING: The `concat` function in 
https://github.com/json-path/JsonPath[JSonPath] has a 
https://issues.apache.org/jira/browse/CAMEL-16393[bug] and does not work. Do 
not use this function.
-You can instead store information in Camel exchange properties or headers and 
then concat those together afterwards using Camel's simple language.
-
 == Easy Syntax
 
 *Since Camel 2.19*
@@ -331,22 +328,4 @@ The same example in XML DSL would be:
 </route>
 ----
 
-== Dependencies
-
-To use JSonPath in your camel routes you need to add the a dependency on
-*camel-jsonpath* which implements the JSonPath language.
-
-If you use maven you could just add the following to your pom.xml,
-substituting the version number for the latest & greatest release (see
-the download page for the latest versions).
-
-[source,xml]
-----
-<dependency>
-  <groupId>org.apache.camel</groupId>
-  <artifactId>camel-jsonpath</artifactId>
-  <version>x.x.x</version>
-</dependency>
-----
-
 
include::{page-component-version}@camel-spring-boot::page$jsonpath-starter.adoc[]
diff --git a/parent/pom.xml b/parent/pom.xml
index f1ed064..3cf2755 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -335,7 +335,7 @@
         <jsch-version>0.1.55</jsch-version>
         <json-api>1.0</json-api>
         <jsonassert-version>1.5.0</jsonassert-version>
-        <json-path-version>2.4.0</json-path-version>
+        <json-path-version>2.6.0</json-path-version>
         <json-simple-version>1.1.1</json-simple-version>
         <jsonata4java-version>1.5.2</jsonata4java-version>
         <json-schema-validator-version>2.2.14</json-schema-validator-version>

Reply via email to