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
commit 110d4afe25427f7104cf5624b8f0ab347f7190f0 Author: jiriOndrusek-agent <[email protected]> AuthorDate: Thu Nov 19 14:24:35 2026 +0000 Fixed jq for Camel 4.24 (jackson-jq 2, CAMEL-27176) - Upgrade quarkiverse-jackson-jq to 3.0.0.Alpha1 (jackson-jq v2, Jackson 3) - BOM: manage camel-jackson3, drop the obsolete jackson-jq v1 exclusions - jq: drop camel-quarkus-jackson, camel-jq now brings camel-jackson3 - Port the jq IT to Jackson 3 and re-enable it (#9364) Co-Authored-By: Claude Opus 5.5 <[email protected]> --- extensions/jq/deployment/pom.xml | 4 ---- extensions/jq/runtime/pom.xml | 4 ---- integration-tests/jq/pom.xml | 6 ------ .../apache/camel/quarkus/component/jq/it/JqResource.java | 14 +++++++------- pom.xml | 2 +- poms/bom/pom.xml | 15 +++++---------- 6 files changed, 13 insertions(+), 32 deletions(-) diff --git a/extensions/jq/deployment/pom.xml b/extensions/jq/deployment/pom.xml index a155e049a9f..2a108224a58 100644 --- a/extensions/jq/deployment/pom.xml +++ b/extensions/jq/deployment/pom.xml @@ -38,10 +38,6 @@ <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-core-deployment</artifactId> </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-jackson-deployment</artifactId> - </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-jq</artifactId> diff --git a/extensions/jq/runtime/pom.xml b/extensions/jq/runtime/pom.xml index a803b82731b..6b946e53990 100644 --- a/extensions/jq/runtime/pom.xml +++ b/extensions/jq/runtime/pom.xml @@ -44,10 +44,6 @@ <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-core</artifactId> </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-jackson</artifactId> - </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-jq</artifactId> diff --git a/integration-tests/jq/pom.xml b/integration-tests/jq/pom.xml index a2f4fcab6f6..092471178ac 100644 --- a/integration-tests/jq/pom.xml +++ b/integration-tests/jq/pom.xml @@ -30,12 +30,6 @@ <name>Camel Quarkus :: Integration Tests :: JQ</name> <description>Integration tests for Camel Quarkus JQ extension</description> - <properties> - <!-- TODO: Re-enable after upgrading to a Quarkus 4 compatible quarkus-jackson-jq - https://github.com/apache/camel-quarkus/issues/9364 --> - <skipTests>true</skipTests> - <quarkus.build.skip>true</quarkus.build.skip> - </properties> - <dependencies> <dependency> <groupId>org.apache.camel.quarkus</groupId> diff --git a/integration-tests/jq/src/main/java/org/apache/camel/quarkus/component/jq/it/JqResource.java b/integration-tests/jq/src/main/java/org/apache/camel/quarkus/component/jq/it/JqResource.java index 0c4d7505b4c..bdbeeadef2c 100644 --- a/integration-tests/jq/src/main/java/org/apache/camel/quarkus/component/jq/it/JqResource.java +++ b/integration-tests/jq/src/main/java/org/apache/camel/quarkus/component/jq/it/JqResource.java @@ -16,11 +16,6 @@ */ package org.apache.camel.quarkus.component.jq.it; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.ObjectNode; -import com.fasterxml.jackson.databind.node.TextNode; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import jakarta.ws.rs.GET; @@ -30,6 +25,11 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.node.ArrayNode; +import tools.jackson.databind.node.ObjectNode; +import tools.jackson.databind.node.StringNode; @Path("/jq") @ApplicationScoped @@ -44,7 +44,7 @@ public class JqResource { @GET public void expression() throws Exception { MockEndpoint endpoint = context.getEndpoint("mock:expression", MockEndpoint.class); - endpoint.expectedBodiesReceived(new TextNode("bar")); + endpoint.expectedBodiesReceived(new StringNode("bar")); ObjectNode node = mapper.createObjectNode() .put("foo", "bar") @@ -59,7 +59,7 @@ public class JqResource { @GET public void expressionHeader() throws Exception { MockEndpoint endpoint = context.getEndpoint("mock:expressionHeader", MockEndpoint.class); - TextNode expected = new TextNode("bar"); + StringNode expected = new StringNode("bar"); endpoint.expectedBodiesReceived(expected); ObjectNode node = mapper.createObjectNode().put("foo", "bar"); diff --git a/pom.xml b/pom.xml index 07b46e676ef..6e0c44d48a1 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ <quarkiverse-freemarker.version>2.0.0.Beta1</quarkiverse-freemarker.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/freemarker/quarkus-freemarker-parent/ --> <quarkiverse-fory.version>1.7.0</quarkiverse-fory.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/fory/quarkus-fory-parent/ --> <quarkiverse-groovy.version>3.40.0</quarkiverse-groovy.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/groovy/quarkus-groovy-parent/ --> - <quarkiverse-jackson-jq.version>2.6.3</quarkiverse-jackson-jq.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/jackson-jq/quarkus-jackson-jq-parent/ --> + <quarkiverse-jackson-jq.version>3.0.0.Alpha1</quarkiverse-jackson-jq.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/jackson-jq/quarkus-jackson-jq-parent/ --> <quarkiverse-jgit.version>4.0.0.Beta1</quarkiverse-jgit.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/jgit/quarkus-jgit/ --> <quarkiverse-jsch.version>4.0.0.Beta1</quarkiverse-jsch.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/jsch/quarkus-jsch/ --> <quarkiverse-langchain4j.version>2.0.0.Beta4</quarkiverse-langchain4j.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/langchain4j/quarkus-langchain4j-parent --> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 181c3ea308f..6404ecbccd5 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -1869,6 +1869,11 @@ <artifactId>camel-jackson-protobuf</artifactId> <version>${camel.version}</version> </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-jackson3</artifactId> + <version>${camel.version}</version> + </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-jacksonxml</artifactId> @@ -2018,16 +2023,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-jq</artifactId> <version>${camel.version}</version> - <exclusions> - <exclusion> - <groupId>net.thisptr</groupId> - <artifactId>jackson-jq</artifactId> - </exclusion> - <exclusion> - <groupId>net.thisptr</groupId> - <artifactId>jackson-jq-extra</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId>
