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 048517758f7e7c4eae77791223b9c562e15f15df Author: jiriOndrusek-agent <[email protected]> AuthorDate: Tue Nov 3 11:43:17 2026 +0000 Fixed fop, langchain4j-ingest test modules fop: Camel moved to fop 2.12 (batik 1.20) while quarkus-batik 2.0.0.Beta1 brings batik 1.19, breaking dependency convergence. Manage batik in the BOM via batik.version synced from fop-parent. Sync xmlgraphics-commons. langchain4j-ingest: fixed by the preceding cherry-pick of the Langchain4jIngestFilterIT stabilization from main. Co-Authored-By: Claude Opus 5.5 <[email protected]> --- pom.xml | 3 +- poms/bom/pom.xml | 95 +++++++++++++++++++ poms/bom/src/main/generated/flattened-full-pom.xml | 105 ++++++++++++++++++++- .../src/main/generated/flattened-reduced-pom.xml | 105 ++++++++++++++++++++- .../generated/flattened-reduced-verbose-pom.xml | 105 ++++++++++++++++++++- 5 files changed, 397 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 7ca25b1f0ce..3443eafcd87 100644 --- a/pom.xml +++ b/pom.xml @@ -83,6 +83,7 @@ <azure-sdk-bom.version>${azure-sdk-bom-version}</azure-sdk-bom.version> <azure-core.version>1.57.0</azure-core.version><!-- @sync com.azure:azure-sdk-bom:${azure-sdk-bom.version} dep:com.azure:azure-core --> <azure-identity.version>1.18.1</azure-identity.version><!-- @sync com.azure:azure-sdk-bom:${azure-sdk-bom.version} dep:com.azure:azure-identity --> + <batik.version>1.20</batik.version><!-- @sync org.apache.xmlgraphics:fop-parent:${fop-version} prop:batik.version --> <caffeine.version>3.3.1</caffeine.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.github.ben-manes.caffeine:caffeine --> <commons-beanutils.version>${commons-beanutils-version}</commons-beanutils.version> <commons-cli.version>1.8.0</commons-cli.version><!-- keep in sync with Quarkus, via quarkus-bootstrap-core --> @@ -185,7 +186,7 @@ <tablesaw.version>0.43.1</tablesaw.version> <threetenbp.version>1.7.0</threetenbp.version><!-- @sync com.google.cloud:google-cloud-pubsub:${google-cloud-pubsub.version} dep:org.threeten:threetenbp --> <xchange.version>${xchange-version}</xchange.version> - <xmlgraphics-commons.version>2.11</xmlgraphics-commons.version><!-- @sync org.apache.xmlgraphics:fop-parent:${fop-version} prop:xmlgraphics.commons.version --> + <xmlgraphics-commons.version>2.12</xmlgraphics-commons.version><!-- @sync org.apache.xmlgraphics:fop-parent:${fop-version} prop:xmlgraphics.commons.version --> <web3j.version>${web3j-version}</web3j.version> <web3j.quorum.version>${web3j-quorum-version}</web3j.quorum.version> <zookeeper.version>${zookeeper-version}</zookeeper.version> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 0d47c7f3038..ba38c7bbf62 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -8250,6 +8250,101 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-anim</artifactId> + <version>${batik.version}</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-awt-util</artifactId> + <version>${batik.version}</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-bridge</artifactId> + <version>${batik.version}</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-codec</artifactId> + <version>${batik.version}</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-constants</artifactId> + <version>${batik.version}</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-css</artifactId> + <version>${batik.version}</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-dom</artifactId> + <version>${batik.version}</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-ext</artifactId> + <version>${batik.version}</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-extension</artifactId> + <version>${batik.version}</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-gvt</artifactId> + <version>${batik.version}</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-i18n</artifactId> + <version>${batik.version}</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-parser</artifactId> + <version>${batik.version}</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-script</artifactId> + <version>${batik.version}</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-shared-resources</artifactId> + <version>${batik.version}</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-svg-dom</artifactId> + <version>${batik.version}</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-svggen</artifactId> + <version>${batik.version}</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-transcoder</artifactId> + <version>${batik.version}</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-util</artifactId> + <version>${batik.version}</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-xml</artifactId> + <version>${batik.version}</version> + </dependency> <dependency> <groupId>org.apache.xmlgraphics</groupId> <artifactId>xmlgraphics-commons</artifactId> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 2b0f0ffe83f..6b05581c289 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -8152,10 +8152,105 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-anim</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-awt-util</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-bridge</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-codec</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-constants</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-css</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-dom</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-ext</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-extension</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-gvt</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-i18n</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-parser</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-script</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-shared-resources</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-svg-dom</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-svggen</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-transcoder</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-util</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-xml</artifactId> + <version>1.20</version> + </dependency> <dependency> <groupId>org.apache.xmlgraphics</groupId> <artifactId>xmlgraphics-commons</artifactId> - <version>2.11</version> + <version>2.12</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -8398,17 +8493,17 @@ <dependency> <groupId>org.web3j</groupId> <artifactId>core</artifactId> - <version>6.0.0</version> + <version>6.1.0</version> </dependency> <dependency> <groupId>org.web3j</groupId> <artifactId>geth</artifactId> - <version>6.0.0</version> + <version>6.1.0</version> </dependency> <dependency> <groupId>org.web3j</groupId> <artifactId>parity</artifactId> - <version>6.0.0</version> + <version>6.1.0</version> </dependency> <dependency> <groupId>org.web3j</groupId> @@ -8423,7 +8518,7 @@ <dependency> <groupId>run.endive</groupId> <artifactId>runtime</artifactId> - <version>1.1.0</version> + <version>1.2.0</version> </dependency> <dependency> <groupId>software.amazon.awssdk</groupId> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 1155b41deb1..7b5eb4e85af 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -9030,10 +9030,105 @@ <artifactId>wss4j-ws-security-stax</artifactId> <version>4.0.2</version> </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-anim</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-awt-util</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-bridge</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-codec</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-constants</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-css</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-dom</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-ext</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-extension</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-gvt</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-i18n</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-parser</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-script</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-shared-resources</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-svg-dom</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-svggen</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-transcoder</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-util</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-xml</artifactId> + <version>1.20</version> + </dependency> <dependency> <groupId>org.apache.xmlgraphics</groupId> <artifactId>xmlgraphics-commons</artifactId> - <version>2.11</version> + <version>2.12</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -9589,17 +9684,17 @@ <dependency> <groupId>org.web3j</groupId> <artifactId>core</artifactId> - <version>6.0.0</version> + <version>6.1.0</version> </dependency> <dependency> <groupId>org.web3j</groupId> <artifactId>geth</artifactId> - <version>6.0.0</version> + <version>6.1.0</version> </dependency> <dependency> <groupId>org.web3j</groupId> <artifactId>parity</artifactId> - <version>6.0.0</version> + <version>6.1.0</version> </dependency> <dependency> <groupId>org.web3j</groupId> @@ -9614,7 +9709,7 @@ <dependency> <groupId>run.endive</groupId> <artifactId>runtime</artifactId> - <version>1.1.0</version> + <version>1.2.0</version> </dependency> <dependency> <groupId>software.amazon.awssdk</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 b6331eb7d46..4fcb5b68db8 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -9030,10 +9030,105 @@ <artifactId>wss4j-ws-security-stax</artifactId> <version>4.0.2</version> </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-anim</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-awt-util</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-bridge</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-codec</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-constants</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-css</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-dom</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-ext</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-extension</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-gvt</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-i18n</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-parser</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-script</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-shared-resources</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-svg-dom</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-svggen</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-transcoder</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-util</artifactId> + <version>1.20</version> + </dependency> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>batik-xml</artifactId> + <version>1.20</version> + </dependency> <dependency> <groupId>org.apache.xmlgraphics</groupId> <artifactId>xmlgraphics-commons</artifactId> - <version>2.11</version> + <version>2.12</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -9589,17 +9684,17 @@ <dependency> <groupId>org.web3j</groupId> <artifactId>core</artifactId> - <version>6.0.0</version> + <version>6.1.0</version> </dependency> <dependency> <groupId>org.web3j</groupId> <artifactId>geth</artifactId> - <version>6.0.0</version> + <version>6.1.0</version> </dependency> <dependency> <groupId>org.web3j</groupId> <artifactId>parity</artifactId> - <version>6.0.0</version> + <version>6.1.0</version> </dependency> <dependency> <groupId>org.web3j</groupId> @@ -9614,7 +9709,7 @@ <dependency> <groupId>run.endive</groupId> <artifactId>runtime</artifactId> - <version>1.1.0</version> + <version>1.2.0</version> </dependency> <dependency> <groupId>software.amazon.awssdk</groupId>
