From 1a6314595133d89d634e60772e329cc8befcb60f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?JB=20Onofr=C3=A9?= <jb.onofre@dremio.com>
Date: Wed, 13 May 2026 08:41:29 +0200
Subject: [PATCH 1/3] Upgrade to Camel 4.18.2

---
 components/camel-spring-parent/pom.xml       |  1 +
 features/src/main/feature/camel-features.xml |  4 +++
 pom.xml                                      | 36 +++++++-------------
 3 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/components/camel-spring-parent/pom.xml b/components/camel-spring-parent/pom.xml
index 350da794b..5d028d121 100644
--- a/components/camel-spring-parent/pom.xml
+++ b/components/camel-spring-parent/pom.xml
@@ -35,6 +35,7 @@
     <modules>
         <module>camel-spring</module>
 
+        <module>camel-spring-ai</module>
         <module>camel-spring-batch</module>
         <module>camel-spring-cloud-config</module>
         <module>camel-spring-jdbc</module>
diff --git a/features/src/main/feature/camel-features.xml b/features/src/main/feature/camel-features.xml
index 4796fedf5..623988cf0 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -3229,6 +3229,10 @@ Chain 2:
         <bundle dependency='true'>mvn:commons-digester/commons-digester/${auto-detect-version}</bundle>
         <bundle>mvn:org.apache.camel.karaf/camel-splunk-hec/${project.version}</bundle>
     </feature>
+    <feature name='camel-spring-ai' version='${project.version}' start-level='50'>
+        <feature version='${camel-osgi-version-range}'>camel-core</feature>
+        <bundle>mvn:org.apache.camel.karaf/camel-spring-ai/${project.version}</bundle>
+    </feature>
     <feature name='camel-spring-batch' version='${project.version}' start-level='50'>
         <feature version='${camel-osgi-version-range}'>camel-core</feature>
         <feature version='${camel-osgi-spring-version}'>spring</feature>
diff --git a/pom.xml b/pom.xml
index d0e8b8d8c..1a1ce5ce8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,11 +90,11 @@
         <javaVersion>17</javaVersion>
         <project.build.outputTimestamp>1776180649</project.build.outputTimestamp>
 
-        <camel-version>4.18.1</camel-version>
+        <camel-version>4.18.2</camel-version>
 
         <!-- START: Maven Properties defining the version of 3rd party libraries used in Camel -->
-        <activemq-version>5.19.2</activemq-version>
-        <activemq6-version>6.2.1</activemq6-version>
+        <activemq-version>5.19.5</activemq-version>
+        <activemq6-version>6.2.4</activemq6-version>
         <activemq-artemis-version>2.44.0</activemq-artemis-version>
         <allegro-converter-version>0.3.0</allegro-converter-version>
         <amazon-kinesis-client-version>2.6.0</amazon-kinesis-client-version>
@@ -107,7 +107,6 @@
         <asm-version>9.9.1</asm-version>
         <asn1bean-version>1.14.0</asn1bean-version>
         <assertj-version>3.27.7</assertj-version>
-        <async-http-client-version>3.0.3</async-http-client-version>
         <asterisk-java-version>3.41.0</asterisk-java-version>
         <atlassian-fugue-version>6.1.2</atlassian-fugue-version>
         <atmosphere-version>3.1.0</atmosphere-version>
@@ -183,10 +182,7 @@
         <disruptor-version>3.4.4</disruptor-version>
         <dnsjava-version>3.6.4</dnsjava-version>
         <djl-version>0.36.0</djl-version>
-        <docling-core-version>0.4.4</docling-core-version>
         <docling-java-version>0.4.4</docling-java-version>
-        <docling-serve-api-version>0.4.4</docling-serve-api-version>
-        <docling-serve-client-version>0.4.4</docling-serve-client-version>
         <docker-java-version>3.7.0</docker-java-version>
         <dropbox-version>7.0.0</dropbox-version>
         <eddsa-version>0.3.0</eddsa-version>
@@ -265,6 +261,7 @@
         <hapi-version>2.6.0</hapi-version>
         <hapi-base-version>2.6.0</hapi-base-version>
         <hapi-fhir-version>8.6.5</hapi-fhir-version>
+        <hapi-fhir-utilities-version>6.9.1</hapi-fhir-utilities-version>
         <hawtio-version>4.6.2</hawtio-version>
         <hazelcast-version>5.4.0</hazelcast-version>
         <hdrhistrogram-version>2.2.2</hdrhistrogram-version>
@@ -297,8 +294,8 @@
         <ivy-version>2.5.3</ivy-version>
         <jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
         <jackson-jq-version>1.6.0</jackson-jq-version>
-        <jackson2-version>2.20.1</jackson2-version>
-        <jackson2-annotations-version>2.20</jackson2-annotations-version>
+        <jackson2-version>2.21.2</jackson2-version>
+        <jackson2-annotations-version>2.21</jackson2-annotations-version>
         <jackrabbit-version>2.22.3</jackrabbit-version>
         <jasminb-jsonapi-version>0.15</jasminb-jsonapi-version>
         <jandex-version>3.5.3</jandex-version>
@@ -356,7 +353,7 @@
         <johnzon-version>2.0.2</johnzon-version>
         <jslt-version>0.1.14</jslt-version>
         <jsmpp-version>3.0.1</jsmpp-version>
-        <jsch-version>2.27.7</jsch-version>
+        <jsch-version>2.28.0</jsch-version>
         <javax-json-api-version>1.1.4</javax-json-api-version>
         <jsonschema-generator-version>4.38.0</jsonschema-generator-version>
         <jsonassert-version>1.5.3</jsonassert-version>
@@ -364,7 +361,6 @@
         <json-patch-version>1.13</json-patch-version>
         <json-smart-version>2.6.0</json-smart-version>
         <jsonata-version>0.9.9</jsonata-version>
-        <jspecify-version>1.0.0</jspecify-version>
         <json-unit-version>5.1.0</json-unit-version>
         <jsoup-version>1.22.1</jsoup-version>
         <jt400-version>21.0.6</jt400-version>
@@ -383,15 +379,13 @@
         <kudu-version>1.18.1</kudu-version>
         <langchain4j-version>1.11.0</langchain4j-version>
         <langchain4j-beta-version>1.11.0-beta19</langchain4j-beta-version>
-        <langchain4j-community-dashscope-version>1.11.0-beta19</langchain4j-community-dashscope-version>
         <langchain4j-community-version>1.11.0-beta19</langchain4j-community-version>
-        <langchain4j-hugging-face-version>1.11.0-beta19</langchain4j-hugging-face-version>
         <leveldbjni-version>1.8</leveldbjni-version>
         <leveldb-api-version>0.12</leveldb-api-version>
         <leveldb-version>0.12</leveldb-version>
         <libphonenumber-version>9.0.23</libphonenumber-version>
         <lifecycle-mapping-version>1.0.0</lifecycle-mapping-version>
-        <log4j2-version>2.25.3</log4j2-version>
+        <log4j2-version>2.25.4</log4j2-version>
         <logback-version>1.5.32</logback-version>
         <lucene-version>9.12.3</lucene-version>
         <lightcouch-version>0.2.0</lightcouch-version>
@@ -419,15 +413,10 @@
         <mybatis-version>3.5.19</mybatis-version>
         <narayana-version>5.13.1.Final</narayana-version>
         <neoscada-version>0.4.0</neoscada-version>
-        <microprofile-fault-tolerance-version>4.1.2</microprofile-fault-tolerance-version>
-        <neo4j-bolt-version>6.0.2</neo4j-bolt-version>
         <neo4j-version>6.0.2</neo4j-version>
-        <netty-version>4.2.12.Final</netty-version>
+        <netty-version>4.1.132.Final</netty-version>
         <netty-reactive-streams-version>2.0.5</netty-reactive-streams-version>
         <networknt-json-schema-validator-version>1.5.9</networknt-json-schema-validator-version>
-        <nimbusds-content-type-version>2.3</nimbusds-content-type-version>
-        <nimbusds-lang-tag-version>1.7</nimbusds-lang-tag-version>
-        <nimbusds-oauth2-oidc-sdk-version>11.23</nimbusds-oauth2-oidc-sdk-version>
         <nimbus-jose-jwt>10.7</nimbus-jose-jwt>
         <nitrite-version>3.4.4</nitrite-version>
         <olingo2-version>2.0.13</olingo2-version>
@@ -472,13 +461,13 @@
         <qpid-broker-version>10.0.1</qpid-broker-version>
         <qpid-proton-j-version>0.34.1</qpid-proton-j-version>
         <qpid-jms-client-version>2.10.0</qpid-jms-client-version>
+        <quarkus-extension-registry-base-url>https://registry.quarkus.io</quarkus-extension-registry-base-url>
         <quarkus-mcp-server-version>1.10.0</quarkus-mcp-server-version>
         <quarkus-version>3.31.3</quarkus-version>
         <quartz-version>2.5.2</quartz-version>
         <quickfixj-version>2.3.2</quickfixj-version>
         <reactive-streams-version>1.0.4</reactive-streams-version>
         <reactor-version>3.8.3</reactor-version>
-        <reactor-netty-incubator-quic-version>0.1.20</reactor-netty-incubator-quic-version>
         <reactor-netty-version>1.3.3</reactor-netty-version>
         <redisson-version>3.52.0</redisson-version>
         <resilience4j-version>2.3.0</resilience4j-version>
@@ -503,7 +492,6 @@
         <smooks-version>2.2.1</smooks-version>
         <snakeyaml-version>2.5</snakeyaml-version>
         <snakeyaml-engine-version>3.0.1</snakeyaml-engine-version>
-        <snakeyaml-engine-kubernetes-version>2.10</snakeyaml-engine-kubernetes-version>
         <snmp4j-version>3.9.7</snmp4j-version>
         <solr-version>9.10.1</solr-version>
         <solr-zookeeper-version>3.9.5</solr-zookeeper-version>
@@ -512,7 +500,7 @@
         <spring-ai-version>1.1.2</spring-ai-version>
         <spring-cloud-config-version>4.3.0</spring-cloud-config-version>
         <spring-batch-version>5.2.5</spring-batch-version>
-        <spring-boot-version>3.5.12</spring-boot-version>
+        <spring-boot-version>3.5.13</spring-boot-version>
         <spring-data-redis-version>3.5.5</spring-data-redis-version>
         <spring-ldap-version>3.3.6</spring-ldap-version>
         <spring-vault-core-version>3.2.0</spring-vault-core-version>
@@ -546,7 +534,7 @@
         <vavr-version>1.0.0</vavr-version>
         <velocity-tools-version>3.1</velocity-tools-version>
         <velocity-version>2.4.1</velocity-version>
-        <vertx-version>4.5.25</vertx-version>
+        <vertx-version>4.5.26</vertx-version>
         <vysper-version>0.7</vysper-version>
         <weaviate-client-version>5.5.0</weaviate-client-version>
         <web3j-version>5.0.0</web3j-version>

From de456c394e59f99a41f66d031ce0559c7a66761b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?JB=20Onofr=C3=A9?= <jb.onofre@dremio.com>
Date: Thu, 14 May 2026 07:43:02 +0200
Subject: [PATCH 2/3] Remove non-existent camel-spring-ai module from
 camel-spring-parent

---
 components/camel-spring-parent/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/camel-spring-parent/pom.xml b/components/camel-spring-parent/pom.xml
index 5d028d121..350da794b 100644
--- a/components/camel-spring-parent/pom.xml
+++ b/components/camel-spring-parent/pom.xml
@@ -35,7 +35,6 @@
     <modules>
         <module>camel-spring</module>
 
-        <module>camel-spring-ai</module>
         <module>camel-spring-batch</module>
         <module>camel-spring-cloud-config</module>
         <module>camel-spring-jdbc</module>

From bbe36f18a06193f9536344fd75e7b8b2096eb5fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?JB=20Onofr=C3=A9?= <jb.onofre@dremio.com>
Date: Sun, 17 May 2026 07:10:32 +0200
Subject: [PATCH 3/3] Add missing properties post upgrade

---
 features/src/main/feature/camel-features.xml |  4 ----
 pom.xml                                      | 16 +++++++++++++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/features/src/main/feature/camel-features.xml b/features/src/main/feature/camel-features.xml
index 623988cf0..4796fedf5 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -3229,10 +3229,6 @@ Chain 2:
         <bundle dependency='true'>mvn:commons-digester/commons-digester/${auto-detect-version}</bundle>
         <bundle>mvn:org.apache.camel.karaf/camel-splunk-hec/${project.version}</bundle>
     </feature>
-    <feature name='camel-spring-ai' version='${project.version}' start-level='50'>
-        <feature version='${camel-osgi-version-range}'>camel-core</feature>
-        <bundle>mvn:org.apache.camel.karaf/camel-spring-ai/${project.version}</bundle>
-    </feature>
     <feature name='camel-spring-batch' version='${project.version}' start-level='50'>
         <feature version='${camel-osgi-version-range}'>camel-core</feature>
         <feature version='${camel-osgi-spring-version}'>spring</feature>
diff --git a/pom.xml b/pom.xml
index 1a1ce5ce8..623e90be5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,6 +107,7 @@
         <asm-version>9.9.1</asm-version>
         <asn1bean-version>1.14.0</asn1bean-version>
         <assertj-version>3.27.7</assertj-version>
+        <async-http-client-version>3.0.3</async-http-client-version>
         <asterisk-java-version>3.41.0</asterisk-java-version>
         <atlassian-fugue-version>6.1.2</atlassian-fugue-version>
         <atmosphere-version>3.1.0</atmosphere-version>
@@ -182,7 +183,10 @@
         <disruptor-version>3.4.4</disruptor-version>
         <dnsjava-version>3.6.4</dnsjava-version>
         <djl-version>0.36.0</djl-version>
+        <docling-core-version>0.4.4</docling-core-version>
         <docling-java-version>0.4.4</docling-java-version>
+        <docling-serve-api-version>0.4.4</docling-serve-api-version>
+        <docling-serve-client-version>0.4.4</docling-serve-client-version>
         <docker-java-version>3.7.0</docker-java-version>
         <dropbox-version>7.0.0</dropbox-version>
         <eddsa-version>0.3.0</eddsa-version>
@@ -361,6 +365,7 @@
         <json-patch-version>1.13</json-patch-version>
         <json-smart-version>2.6.0</json-smart-version>
         <jsonata-version>0.9.9</jsonata-version>
+        <jspecify-version>1.0.0</jspecify-version>
         <json-unit-version>5.1.0</json-unit-version>
         <jsoup-version>1.22.1</jsoup-version>
         <jt400-version>21.0.6</jt400-version>
@@ -379,7 +384,9 @@
         <kudu-version>1.18.1</kudu-version>
         <langchain4j-version>1.11.0</langchain4j-version>
         <langchain4j-beta-version>1.11.0-beta19</langchain4j-beta-version>
+        <langchain4j-community-dashscope-version>1.11.0-beta19</langchain4j-community-dashscope-version>
         <langchain4j-community-version>1.11.0-beta19</langchain4j-community-version>
+        <langchain4j-hugging-face-version>1.11.0-beta19</langchain4j-hugging-face-version>
         <leveldbjni-version>1.8</leveldbjni-version>
         <leveldb-api-version>0.12</leveldb-api-version>
         <leveldb-version>0.12</leveldb-version>
@@ -413,10 +420,15 @@
         <mybatis-version>3.5.19</mybatis-version>
         <narayana-version>5.13.1.Final</narayana-version>
         <neoscada-version>0.4.0</neoscada-version>
+        <microprofile-fault-tolerance-version>4.1.2</microprofile-fault-tolerance-version>
+        <neo4j-bolt-version>6.0.2</neo4j-bolt-version>
         <neo4j-version>6.0.2</neo4j-version>
-        <netty-version>4.1.132.Final</netty-version>
+        <netty-version>4.2.12.Final</netty-version>
         <netty-reactive-streams-version>2.0.5</netty-reactive-streams-version>
         <networknt-json-schema-validator-version>1.5.9</networknt-json-schema-validator-version>
+        <nimbusds-content-type-version>2.3</nimbusds-content-type-version>
+        <nimbusds-lang-tag-version>1.7</nimbusds-lang-tag-version>
+        <nimbusds-oauth2-oidc-sdk-version>11.23</nimbusds-oauth2-oidc-sdk-version>
         <nimbus-jose-jwt>10.7</nimbus-jose-jwt>
         <nitrite-version>3.4.4</nitrite-version>
         <olingo2-version>2.0.13</olingo2-version>
@@ -468,6 +480,7 @@
         <quickfixj-version>2.3.2</quickfixj-version>
         <reactive-streams-version>1.0.4</reactive-streams-version>
         <reactor-version>3.8.3</reactor-version>
+        <reactor-netty-incubator-quic-version>0.1.20</reactor-netty-incubator-quic-version>
         <reactor-netty-version>1.3.3</reactor-netty-version>
         <redisson-version>3.52.0</redisson-version>
         <resilience4j-version>2.3.0</resilience4j-version>
@@ -492,6 +505,7 @@
         <smooks-version>2.2.1</smooks-version>
         <snakeyaml-version>2.5</snakeyaml-version>
         <snakeyaml-engine-version>3.0.1</snakeyaml-engine-version>
+        <snakeyaml-engine-kubernetes-version>2.10</snakeyaml-engine-kubernetes-version>
         <snmp4j-version>3.9.7</snmp4j-version>
         <solr-version>9.10.1</solr-version>
         <solr-zookeeper-version>3.9.5</solr-zookeeper-version>