This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/camel-main by this push: new 31b1574138 Synced + generated files, fix of jq, jsonpath becauseof CAMEL-20378 31b1574138 is described below commit 31b157413826c629637302fd08071850b94a4877 Author: JiriOndrusek <ondrusek.j...@gmail.com> AuthorDate: Fri Feb 9 10:21:22 2024 +0100 Synced + generated files, fix of jq, jsonpath becauseof CAMEL-20378 --- docs/modules/ROOT/pages/reference/extensions/splunk-hec.adoc | 2 +- .../java/org/apache/camel/quarkus/component/jq/it/JqRoutes.java | 8 +++++--- .../camel/quarkus/component/json/path/it/JsonPathTestRoute.java | 5 ++++- pom.xml | 2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +- 7 files changed, 14 insertions(+), 9 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/splunk-hec.adoc b/docs/modules/ROOT/pages/reference/extensions/splunk-hec.adoc index 5b15269168..6905300e4e 100644 --- a/docs/modules/ROOT/pages/reference/extensions/splunk-hec.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/splunk-hec.adoc @@ -22,7 +22,7 @@ The splunk component allows to publish events in Splunk using the HTTP Event Col [id="extensions-splunk-hec-whats-inside"] == What's inside -* xref:{cq-camel-components}::splunk-hec-component.adoc[Splunk HEC component], URI syntax: `splunk-hec:splunkURL/token` +* xref:{cq-camel-components}::splunk-hec-component.adoc[Splunk HEC component], URI syntax: `splunk-hec:splunkURL` Please refer to the above link for usage and configuration details. diff --git a/integration-tests/jq/src/main/java/org/apache/camel/quarkus/component/jq/it/JqRoutes.java b/integration-tests/jq/src/main/java/org/apache/camel/quarkus/component/jq/it/JqRoutes.java index 18589c84f8..7552f64f3f 100644 --- a/integration-tests/jq/src/main/java/org/apache/camel/quarkus/component/jq/it/JqRoutes.java +++ b/integration-tests/jq/src/main/java/org/apache/camel/quarkus/component/jq/it/JqRoutes.java @@ -22,12 +22,14 @@ public class JqRoutes extends RouteBuilder { @Override public void configure() throws Exception { + var jq = expression().jq().expression(".foo").source("header:Content").end(); + from("direct:expression") .transform().jq(".foo") .to("mock:expression"); from("direct:expressionHeader") - .transform().jq(".foo", "Content") + .transform(jq) .to("mock:expressionHeader"); from("direct:expressionHeaderFunction") @@ -35,7 +37,7 @@ public class JqRoutes extends RouteBuilder { .to("mock:expressionHeaderFunction"); from("direct:expressionHeaderString") - .transform().jq(".foo", String.class, "Content") + .transform(jq) .to("mock:expressionHeaderString"); from("direct:expressionPojo") @@ -43,7 +45,7 @@ public class JqRoutes extends RouteBuilder { .to("mock:expressionPojo"); from("direct:expressionProperty") - .transform().jq(".foo", "Content") + .transform(jq) .to("mock:expressionProperty"); from("direct:expressionPropertyFunction") diff --git a/integration-tests/jsonpath/src/main/java/org/apache/camel/quarkus/component/json/path/it/JsonPathTestRoute.java b/integration-tests/jsonpath/src/main/java/org/apache/camel/quarkus/component/json/path/it/JsonPathTestRoute.java index 31bfa7b651..1eb1cc5c56 100644 --- a/integration-tests/jsonpath/src/main/java/org/apache/camel/quarkus/component/json/path/it/JsonPathTestRoute.java +++ b/integration-tests/jsonpath/src/main/java/org/apache/camel/quarkus/component/json/path/it/JsonPathTestRoute.java @@ -25,6 +25,9 @@ public class JsonPathTestRoute extends RouteBuilder { @Override public void configure() { + var jp = expression().jsonpath().expression("$.book.price").resultType(int.class) + .source("header:jsonBookHeader").end(); + from("direct:getBookPriceLevel") .choice() .when().jsonpath("$.store.book[?(@.price < 10)]") @@ -42,7 +45,7 @@ public class JsonPathTestRoute extends RouteBuilder { from("direct:splitBooks").split().jsonpath("$.books[*]").to("mock:prices"); - from("direct:setHeader").setHeader("price").jsonpath("$.book.price", false, int.class, "jsonBookHeader") + from("direct:setHeader").setHeader("price", jp) .to("mock:setHeader"); from("direct:getAuthorsFromJsonStream").transform().jsonpath("$.store.book[*].title"); diff --git a/pom.xml b/pom.xml index c98ed07eff..182f63f42a 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ <msal4j.version>1.14.0</msal4j.version><!-- @sync com.azure:azure-identity:${azure-identity.version} dep:com.microsoft.azure:msal4j --> <mvel2.version>2.5.2.Final</mvel2.version><!-- @sync org.apache.camel:camel-dependencies:${camel.version} prop:mvel-version --> <mybatis.version>3.5.15</mybatis.version><!-- @sync io.quarkiverse.mybatis:quarkus-parent:${quarkiverse-mybatis.version} prop:mybatis.version --> - <oak-jackrabbit-api.version>1.48.0</oak-jackrabbit-api.version><!-- @sync org.apache.jackrabbit:jackrabbit-parent:${jackrabbit-version} prop:oak-jackrabbit-api.version.implemented --> + <oak-jackrabbit-api.version>1.60.0</oak-jackrabbit-api.version><!-- @sync org.apache.jackrabbit:jackrabbit-parent:${jackrabbit-version} prop:oak-jackrabbit-api.version.implemented --> <okio.version>${squareup-okio-version}</okio.version> <opencensus.version>0.31.0</opencensus.version><!-- Mess in Google cloud. Keep in sync with version used in com.google.http-client:google-http-client --> <perfmark-api.version>0.26.0</perfmark-api.version><!-- @sync io.grpc:grpc-netty-shaded:${grpc.version} dep:io.perfmark:perfmark-api --> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 7c50f6962f..d795c8be0a 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6447,7 +6447,7 @@ <dependency> <groupId>org.apache.jackrabbit</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>oak-jackrabbit-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.48.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.60.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.apache.kafka</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index abe6590fa4..9c7b648ba3 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6387,7 +6387,7 @@ <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>oak-jackrabbit-api</artifactId> - <version>1.48.0</version> + <version>1.60.0</version> </dependency> <dependency> <groupId>org.apache.kafka</groupId> diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 555bb06ef8..e84f5483ec 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6387,7 +6387,7 @@ <dependency> <groupId>org.apache.jackrabbit</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>oak-jackrabbit-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.48.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.60.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.apache.kafka</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->