This is an automated email from the ASF dual-hosted git repository. apupier pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 17599369c626d1218c4ed1c1e1be40dccbcb0ddd Author: 0x6A75626172 <[email protected]> AuthorDate: Mon Sep 21 10:43:51 2026 +0200 CAMEL-24806: camel-jolt - Switch from unmaintained bazaarvoice jolt to the jolt-community fork - Set jolt-version to 1.3.0 in camel-parent - Switch jolt dependencies to io.github.jolt-community.jolt:jolt-community-core and io.github.jolt-community.jolt:json-community-utils - Migrate imports from com.bazaarvoice.jolt to io.joltcommunity.jolt - Add migration note for camel-jolt to the Camel 4.23 upgrade guide --- .../org/apache/camel/catalog/components/jolt.json | 2 +- .../org/apache/camel/catalog/docs/jolt-component.adoc | 2 +- components/camel-jolt/pom.xml | 8 ++++---- .../camel/component/jolt/JoltComponentConfigurer.java | 4 ++-- .../META-INF/org/apache/camel/component/jolt/jolt.json | 2 +- .../camel-jolt/src/main/docs/jolt-component.adoc | 2 +- .../org/apache/camel/component/jolt/JoltComponent.java | 2 +- .../org/apache/camel/component/jolt/JoltEndpoint.java | 18 +++++++++--------- .../ROOT/pages/camel-4x-upgrade-guide-4_23.adoc | 11 ++++++++++- parent/pom.xml | 2 +- 10 files changed, 31 insertions(+), 22 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jolt.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jolt.json index aa305f75ed52..652a51696c39 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jolt.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jolt.json @@ -28,7 +28,7 @@ "contentCache": { "index": 1, "kind": "property", "displayName": "Content Cache", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Sets whether to use resource content cache or not" }, "lazyStartProducer": { "index": 2, "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail [...] "autowiredEnabled": { "index": 3, "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching t [...] - "transform": { "index": 4, "kind": "property", "displayName": "Transform", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "com.bazaarvoice.jolt.Transform", "deprecated": false, "autowired": false, "secret": false, "description": "Explicitly sets the Transform to use. If not set a Transform specified by the transformDsl will be created" } + "transform": { "index": 4, "kind": "property", "displayName": "Transform", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "io.joltcommunity.jolt.Transform", "deprecated": false, "autowired": false, "secret": false, "description": "Explicitly sets the Transform to use. If not set a Transform specified by the transformDsl will be created" } }, "headers": { "CamelJoltResourceUri": { "index": 0, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The resource URI", "constantName": "org.apache.camel.component.jolt.JoltConstants#JOLT_RESOURCE_URI" }, diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jolt-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jolt-component.adoc index 4b4bb3496d90..7377730c0f55 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jolt-component.adoc +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jolt-component.adoc @@ -13,7 +13,7 @@ *{component-header}* The Jolt component allows you to process a JSON messages using a -https://github.com/bazaarvoice/jolt[JOLT] specification. This can be +https://github.com/jolt-community/jolt-community[JOLT] specification. This can be ideal when doing JSON to JSON transformation. Maven users will need to add the following dependency to diff --git a/components/camel-jolt/pom.xml b/components/camel-jolt/pom.xml index a591323acabb..8121f2f22836 100644 --- a/components/camel-jolt/pom.xml +++ b/components/camel-jolt/pom.xml @@ -51,13 +51,13 @@ </dependency> <dependency> - <groupId>com.bazaarvoice.jolt</groupId> - <artifactId>jolt-core</artifactId> + <groupId>io.github.jolt-community.jolt</groupId> + <artifactId>jolt-community-core</artifactId> <version>${jolt-version}</version> </dependency> <dependency> - <groupId>com.bazaarvoice.jolt</groupId> - <artifactId>json-utils</artifactId> + <groupId>io.github.jolt-community.jolt</groupId> + <artifactId>json-community-utils</artifactId> <version>${jolt-version}</version> </dependency> diff --git a/components/camel-jolt/src/generated/java/org/apache/camel/component/jolt/JoltComponentConfigurer.java b/components/camel-jolt/src/generated/java/org/apache/camel/component/jolt/JoltComponentConfigurer.java index a70267b10d69..9f5d8e866642 100644 --- a/components/camel-jolt/src/generated/java/org/apache/camel/component/jolt/JoltComponentConfigurer.java +++ b/components/camel-jolt/src/generated/java/org/apache/camel/component/jolt/JoltComponentConfigurer.java @@ -31,7 +31,7 @@ public class JoltComponentConfigurer extends PropertyConfigurerSupport implement case "contentCache": target.setContentCache(property(camelContext, boolean.class, value)); return true; case "lazystartproducer": case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true; - case "transform": target.setTransform(property(camelContext, com.bazaarvoice.jolt.Transform.class, value)); return true; + case "transform": target.setTransform(property(camelContext, io.joltcommunity.jolt.Transform.class, value)); return true; default: return false; } } @@ -47,7 +47,7 @@ public class JoltComponentConfigurer extends PropertyConfigurerSupport implement case "contentCache": return boolean.class; case "lazystartproducer": case "lazyStartProducer": return boolean.class; - case "transform": return com.bazaarvoice.jolt.Transform.class; + case "transform": return io.joltcommunity.jolt.Transform.class; default: return null; } } diff --git a/components/camel-jolt/src/generated/resources/META-INF/org/apache/camel/component/jolt/jolt.json b/components/camel-jolt/src/generated/resources/META-INF/org/apache/camel/component/jolt/jolt.json index aa305f75ed52..652a51696c39 100644 --- a/components/camel-jolt/src/generated/resources/META-INF/org/apache/camel/component/jolt/jolt.json +++ b/components/camel-jolt/src/generated/resources/META-INF/org/apache/camel/component/jolt/jolt.json @@ -28,7 +28,7 @@ "contentCache": { "index": 1, "kind": "property", "displayName": "Content Cache", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Sets whether to use resource content cache or not" }, "lazyStartProducer": { "index": 2, "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail [...] "autowiredEnabled": { "index": 3, "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching t [...] - "transform": { "index": 4, "kind": "property", "displayName": "Transform", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "com.bazaarvoice.jolt.Transform", "deprecated": false, "autowired": false, "secret": false, "description": "Explicitly sets the Transform to use. If not set a Transform specified by the transformDsl will be created" } + "transform": { "index": 4, "kind": "property", "displayName": "Transform", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "io.joltcommunity.jolt.Transform", "deprecated": false, "autowired": false, "secret": false, "description": "Explicitly sets the Transform to use. If not set a Transform specified by the transformDsl will be created" } }, "headers": { "CamelJoltResourceUri": { "index": 0, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The resource URI", "constantName": "org.apache.camel.component.jolt.JoltConstants#JOLT_RESOURCE_URI" }, diff --git a/components/camel-jolt/src/main/docs/jolt-component.adoc b/components/camel-jolt/src/main/docs/jolt-component.adoc index 4b4bb3496d90..7377730c0f55 100644 --- a/components/camel-jolt/src/main/docs/jolt-component.adoc +++ b/components/camel-jolt/src/main/docs/jolt-component.adoc @@ -13,7 +13,7 @@ *{component-header}* The Jolt component allows you to process a JSON messages using a -https://github.com/bazaarvoice/jolt[JOLT] specification. This can be +https://github.com/jolt-community/jolt-community[JOLT] specification. This can be ideal when doing JSON to JSON transformation. Maven users will need to add the following dependency to diff --git a/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltComponent.java b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltComponent.java index b0bca6888295..aecf2bfbdf65 100644 --- a/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltComponent.java +++ b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltComponent.java @@ -18,7 +18,7 @@ package org.apache.camel.component.jolt; import java.util.Map; -import com.bazaarvoice.jolt.Transform; +import io.joltcommunity.jolt.Transform; import org.apache.camel.Endpoint; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.annotations.Component; diff --git a/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltEndpoint.java b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltEndpoint.java index 3731c94fee32..b5c4a65a0bf8 100644 --- a/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltEndpoint.java +++ b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltEndpoint.java @@ -19,15 +19,15 @@ package org.apache.camel.component.jolt; import java.io.InputStream; import java.util.Map; -import com.bazaarvoice.jolt.Chainr; -import com.bazaarvoice.jolt.ContextualTransform; -import com.bazaarvoice.jolt.Defaultr; -import com.bazaarvoice.jolt.JoltTransform; -import com.bazaarvoice.jolt.JsonUtils; -import com.bazaarvoice.jolt.Removr; -import com.bazaarvoice.jolt.Shiftr; -import com.bazaarvoice.jolt.Sortr; -import com.bazaarvoice.jolt.Transform; +import io.joltcommunity.jolt.Chainr; +import io.joltcommunity.jolt.ContextualTransform; +import io.joltcommunity.jolt.Defaultr; +import io.joltcommunity.jolt.JoltTransform; +import io.joltcommunity.jolt.JsonUtils; +import io.joltcommunity.jolt.Shiftr; +import io.joltcommunity.jolt.Sortr; +import io.joltcommunity.jolt.Transform; +import io.joltcommunity.jolt.removr.Removr; import org.apache.camel.Category; import org.apache.camel.Exchange; import org.apache.camel.ExchangePattern; diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_23.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_23.adoc index a225847e2772..80276582a692 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_23.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_23.adoc @@ -2460,7 +2460,6 @@ The `maxRetryTimeout` endpoint and component option is deprecated in both `camel it had no effect. The option is kept for backward compatibility of existing endpoint URIs but is marked deprecated and will be removed in a future release. Routes that set `maxRetryTimeout` can simply drop it; behaviour is unchanged. - === camel-saxon - external XML entity resolution disabled by default in XQuery @@ -2479,3 +2478,13 @@ A deployment that genuinely needs to parse documents with a `DOCTYPE` or externa its own pre-configured Saxon `Configuration` through the `configuration` option of the `xquery` endpoint or language (or `XQueryBuilder.setConfiguration(...)`); a user-supplied `Configuration` is used as-is and is not modified. + +=== camel-jolt - switch from unmaintained bazaarvoice jolt to the jolt-community fork + +The JOLT library dependency has been migrated from `com.bazaarvoice.jolt:jolt-core` to +`io.github.jolt-community.jolt:jolt-community-core`. +See https://github.com/jolt-community/jolt-community[JOLT (Community Edition)]. + +Due to the package rename from `com.bazaarvoice.jolt` to `io.joltcommunity.jolt`, users who plug custom `Transform` or +`ContextualTransform` classes into a Chainr spec need to update their imports to `io.joltcommunity.jolt.Transform` and +`io.joltcommunity.jolt.ContextualTransform`. diff --git a/parent/pom.xml b/parent/pom.xml index 5b0c601de6cd..76f4e8c32b92 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -316,7 +316,7 @@ <libthrift-version>0.24.0</libthrift-version> <jodatime2-version>2.14.3</jodatime2-version> <jolokia-version>2.6.2</jolokia-version> - <jolt-version>0.1.8</jolt-version> + <jolt-version>1.3.0</jolt-version> <jool-version>0.9.15</jool-version> <!-- jooq 3.20 is Java 21+ only so we need to be 3.19.x --> <jooq-version>3.19.30</jooq-version>
