You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by fm...@apache.org on 2024/01/25 12:46:36 UTC

(camel-spring-boot) 23/40: Override tomcat version coming in from sb to 10.1.14 (#284)

This is an automated email from the ASF dual-hosted git repository.

fmariani pushed a commit to branch camel-spring-boot-4.0.0-branch
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git

commit 2faa5c55306a0f659ddcc4c5e1025f7d78c4f92b
Author: Tom Cunningham <tc...@redhat.com>
AuthorDate: Tue Oct 17 11:17:29 2023 -0400

    Override tomcat version coming in from sb to 10.1.14 (#284)
---
 .../camel/springboot/catalog/components/kafka.json |   8 +-
 .../camel-kafka-starter/src/main/docs/kafka.json   |   4 +-
 .../springboot/KafkaComponentConfiguration.java    |   4 +-
 pom.xml                                            |   9 +-
 tooling/camel-spring-boot-bom/pom.xml              |   6 +-
 tooling/camel-spring-boot-dependencies/pom.xml     | 408 ++++++++++-----------
 .../src/main/resources/pom.xml                     |  36 ++
 tooling/redhat-camel-spring-boot-bom/pom.xml       |  56 ++-
 8 files changed, 302 insertions(+), 229 deletions(-)

diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json
index 9d52ce4ea29..45db718f30b 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json
@@ -37,7 +37,7 @@
     "bridgeErrorHandler": { "index": 12, "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be proc [...]
     "checkCrcs": { "index": 13, "kind": "property", "displayName": "Check Crcs", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Automatically check the CRC32 of the records consumed. This ensures no on-the-wire o [...]
     "commitTimeoutMs": { "index": 14, "kind": "property", "displayName": "Commit Timeout Ms", "group": "consumer", "label": "consumer", "required": false, "type": "duration", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The maximum time, in milliseconds, that the code will wait for a synchron [...]
-    "consumerRequestTimeoutMs": { "index": 15, "kind": "property", "displayName": "Consumer Request Timeout Ms", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "40000", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The configuration controls the maximum amount of ti [...]
+    "consumerRequestTimeoutMs": { "index": 15, "kind": "property", "displayName": "Consumer Request Timeout Ms", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "30000", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The configuration controls the maximum amount of ti [...]
     "consumersCount": { "index": 16, "kind": "property", "displayName": "Consumers Count", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The number of consumers that connect to kafka server. Each consumer is run on a separate thre [...]
     "fetchMaxBytes": { "index": 17, "kind": "property", "displayName": "Fetch Max Bytes", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "52428800", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The maximum amount of data the server should return for a fetch request [...]
     "fetchMinBytes": { "index": 18, "kind": "property", "displayName": "Fetch Min Bytes", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The minimum amount of data the server should return for a fetch request. If in [...]
@@ -55,7 +55,7 @@
     "pollOnError": { "index": 30, "kind": "property", "displayName": "Poll On Error", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.kafka.PollOnError", "enum": [ "DISCARD", "ERROR_HANDLER", "RECONNECT", "RETRY", "STOP" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "ERROR_HANDLER", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "config [...]
     "pollTimeoutMs": { "index": 31, "kind": "property", "displayName": "Poll Timeout Ms", "group": "consumer", "label": "consumer", "required": false, "type": "duration", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The timeout used when polling the KafkaConsumer." },
     "seekTo": { "index": 32, "kind": "property", "displayName": "Seek To", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.kafka.SeekPolicy", "enum": [ "BEGINNING", "END" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Set if KafkaConsumer will read from the beginning or the  [...]
-    "sessionTimeoutMs": { "index": 33, "kind": "property", "displayName": "Session Timeout Ms", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "10000", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The timeout used to detect failures when using Kafka's group managem [...]
+    "sessionTimeoutMs": { "index": 33, "kind": "property", "displayName": "Session Timeout Ms", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "45000", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The timeout used to detect failures when using Kafka's group managem [...]
     "specificAvroReader": { "index": 34, "kind": "property", "displayName": "Specific Avro Reader", "group": "consumer", "label": "confluent,consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "This enables the use of a specific Avro reader for use with the Co [...]
     "topicIsPattern": { "index": 35, "kind": "property", "displayName": "Topic Is Pattern", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Whether the topic is a pattern (regular expression). This can be used to subscribe t [...]
     "valueDeserializer": { "index": 36, "kind": "property", "displayName": "Value Deserializer", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "org.apache.kafka.common.serialization.StringDeserializer", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Deserializer class [...]
@@ -165,7 +165,7 @@
     "breakOnFirstError": { "index": 11, "kind": "parameter", "displayName": "Break On First Error", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "This options controls what happens when a consumer is processing an exchange [...]
     "checkCrcs": { "index": 12, "kind": "parameter", "displayName": "Check Crcs", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Automatically check the CRC32 of the records consumed. This ensures no on-the-wire  [...]
     "commitTimeoutMs": { "index": 13, "kind": "parameter", "displayName": "Commit Timeout Ms", "group": "consumer", "label": "consumer", "required": false, "type": "duration", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The maximum time, in milliseconds, that the code will wait for a synchro [...]
-    "consumerRequestTimeoutMs": { "index": 14, "kind": "parameter", "displayName": "Consumer Request Timeout Ms", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "40000", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The configuration controls the maximum amount of t [...]
+    "consumerRequestTimeoutMs": { "index": 14, "kind": "parameter", "displayName": "Consumer Request Timeout Ms", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "30000", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The configuration controls the maximum amount of t [...]
     "consumersCount": { "index": 15, "kind": "parameter", "displayName": "Consumers Count", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The number of consumers that connect to kafka server. Each consumer is run on a separate thr [...]
     "fetchMaxBytes": { "index": 16, "kind": "parameter", "displayName": "Fetch Max Bytes", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "52428800", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The maximum amount of data the server should return for a fetch reques [...]
     "fetchMinBytes": { "index": 17, "kind": "parameter", "displayName": "Fetch Min Bytes", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The minimum amount of data the server should return for a fetch request. If i [...]
@@ -183,7 +183,7 @@
     "pollOnError": { "index": 29, "kind": "parameter", "displayName": "Poll On Error", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.kafka.PollOnError", "enum": [ "DISCARD", "ERROR_HANDLER", "RECONNECT", "RETRY", "STOP" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "ERROR_HANDLER", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "confi [...]
     "pollTimeoutMs": { "index": 30, "kind": "parameter", "displayName": "Poll Timeout Ms", "group": "consumer", "label": "consumer", "required": false, "type": "duration", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The timeout used when polling the KafkaConsumer." },
     "seekTo": { "index": 31, "kind": "parameter", "displayName": "Seek To", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.kafka.SeekPolicy", "enum": [ "BEGINNING", "END" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Set if KafkaConsumer will read from the beginning or the [...]
-    "sessionTimeoutMs": { "index": 32, "kind": "parameter", "displayName": "Session Timeout Ms", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "10000", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The timeout used to detect failures when using Kafka's group manage [...]
+    "sessionTimeoutMs": { "index": 32, "kind": "parameter", "displayName": "Session Timeout Ms", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "45000", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The timeout used to detect failures when using Kafka's group manage [...]
     "specificAvroReader": { "index": 33, "kind": "parameter", "displayName": "Specific Avro Reader", "group": "consumer", "label": "confluent,consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "This enables the use of a specific Avro reader for use with the C [...]
     "topicIsPattern": { "index": 34, "kind": "parameter", "displayName": "Topic Is Pattern", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Whether the topic is a pattern (regular expression). This can be used to subscribe  [...]
     "valueDeserializer": { "index": 35, "kind": "parameter", "displayName": "Value Deserializer", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "org.apache.kafka.common.serialization.StringDeserializer", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Deserializer clas [...]
diff --git a/components-starter/camel-kafka-starter/src/main/docs/kafka.json b/components-starter/camel-kafka-starter/src/main/docs/kafka.json
index 594fe7887ce..bd855acebb7 100644
--- a/components-starter/camel-kafka-starter/src/main/docs/kafka.json
+++ b/components-starter/camel-kafka-starter/src/main/docs/kafka.json
@@ -133,7 +133,7 @@
       "type": "java.lang.Integer",
       "description": "The configuration controls the maximum amount of time the client will wait for the response of a request. If the response is not received before the timeout elapses the client will resend the request if necessary or fail the request if retries are exhausted.",
       "sourceType": "org.apache.camel.component.kafka.springboot.KafkaComponentConfiguration",
-      "defaultValue": 40000
+      "defaultValue": 30000
     },
     {
       "name": "camel.component.kafka.consumers-count",
@@ -588,7 +588,7 @@
       "type": "java.lang.Integer",
       "description": "The timeout used to detect failures when using Kafka's group management facilities.",
       "sourceType": "org.apache.camel.component.kafka.springboot.KafkaComponentConfiguration",
-      "defaultValue": 10000
+      "defaultValue": 45000
     },
     {
       "name": "camel.component.kafka.shutdown-timeout",
diff --git a/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java b/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
index b98b0c80ee2..21e0c873a50 100644
--- a/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
+++ b/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
@@ -155,7 +155,7 @@ public class KafkaComponentConfiguration
      * before the timeout elapses the client will resend the request if
      * necessary or fail the request if retries are exhausted.
      */
-    private Integer consumerRequestTimeoutMs = 40000;
+    private Integer consumerRequestTimeoutMs = 30000;
     /**
      * The number of consumers that connect to kafka server. Each consumer is
      * run on a separate thread, that retrieves and process the incoming data.
@@ -286,7 +286,7 @@ public class KafkaComponentConfiguration
      * The timeout used to detect failures when using Kafka's group management
      * facilities.
      */
-    private Integer sessionTimeoutMs = 10000;
+    private Integer sessionTimeoutMs = 45000;
     /**
      * This enables the use of a specific Avro reader for use with the Confluent
      * Platform schema registry and the
diff --git a/pom.xml b/pom.xml
index 246fecfa397..55b1dee7a01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-dependencies</artifactId>
-        <version>4.0.0</version>
+        <version>4.0.0.redhat-00025</version>
     </parent>
 
     <groupId>org.apache.camel.springboot</groupId>
@@ -112,16 +112,16 @@
         <spring-boot-version>3.1.4</spring-boot-version>
 
         <!-- Camel target version -->
-        <camel-version>4.0.0.redhat-00010</camel-version>
+        <camel-version>4.0.0.redhat-00025</camel-version>
 
         <!-- cq plugin version -->
         <cq-plugin.version>4.4.2</cq-plugin.version>
         <camel-community.version>4.0.0</camel-community.version>
         <camel-spring-boot-community.version>4.0.0</camel-spring-boot-community.version>
-        <camel-sap.version>4.0.0.redhat-00044</camel-sap.version>
+        <camel-sap.version>4.0.0.redhat-00059</camel-sap.version>
 
         <!-- narayana spring boot version -->
-        <narayana-spring-boot.version>3.0.0.redhat-00017</narayana-spring-boot.version>
+        <narayana-spring-boot.version>3.0.0.redhat-00060</narayana-spring-boot.version>
 
         <!-- versions -->
         <aether-version>1.0.2.v20150114</aether-version>
@@ -140,6 +140,7 @@
         <springdoc-version>2.2.0</springdoc-version>
         <surefire.version>${maven-surefire-plugin-version}</surefire.version>
         <swagger-parser-v3-version>2.1.10</swagger-parser-v3-version>
+        <tomcat-version>10.1.14</tomcat-version>
         <cyclonedx-maven-plugin-version>2.7.9</cyclonedx-maven-plugin-version>
 
         <!-- Added for productized build - plexus versions used by patch maven plugin -->
diff --git a/tooling/camel-spring-boot-bom/pom.xml b/tooling/camel-spring-boot-bom/pom.xml
index 3ea97d7038b..c641a60f296 100644
--- a/tooling/camel-spring-boot-bom/pom.xml
+++ b/tooling/camel-spring-boot-bom/pom.xml
@@ -36,17 +36,17 @@
       <dependency>
         <groupId>me.snowdrop</groupId>
         <artifactId>narayana-spring-boot-core</artifactId>
-        <version>3.0.0.redhat-00017</version>
+        <version>3.0.0.redhat-00060</version>
       </dependency>
       <dependency>
         <groupId>me.snowdrop</groupId>
         <artifactId>narayana-spring-boot-recovery-controller</artifactId>
-        <version>3.0.0.redhat-00017</version>
+        <version>3.0.0.redhat-00060</version>
       </dependency>
       <dependency>
         <groupId>me.snowdrop</groupId>
         <artifactId>narayana-spring-boot-starter</artifactId>
-        <version>3.0.0.redhat-00017</version>
+        <version>3.0.0.redhat-00060</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel.springboot</groupId>
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml
index 1ca233cd608..32e30d69fe0 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -200,52 +200,52 @@
       <dependency>
         <groupId>me.snowdrop</groupId>
         <artifactId>narayana-spring-boot-core</artifactId>
-        <version>3.0.0.redhat-00017</version>
+        <version>3.0.0.redhat-00060</version>
       </dependency>
       <dependency>
         <groupId>me.snowdrop</groupId>
         <artifactId>narayana-spring-boot-recovery-controller</artifactId>
-        <version>3.0.0.redhat-00017</version>
+        <version>3.0.0.redhat-00060</version>
       </dependency>
       <dependency>
         <groupId>me.snowdrop</groupId>
         <artifactId>narayana-spring-boot-starter</artifactId>
-        <version>3.0.0.redhat-00017</version>
+        <version>3.0.0.redhat-00060</version>
       </dependency>
       <dependency>
         <groupId>org.apache.avro</groupId>
         <artifactId>avro</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.3</version>
       </dependency>
       <dependency>
         <groupId>org.apache.avro</groupId>
         <artifactId>avro-ipc</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.3</version>
       </dependency>
       <dependency>
         <groupId>org.apache.avro</groupId>
         <artifactId>avro-mapred</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.3</version>
       </dependency>
       <dependency>
         <groupId>org.apache.avro</groupId>
         <artifactId>avro-protobuf</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.3</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel.maven</groupId>
         <artifactId>camel-debezium-maven-plugin</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel.maven</groupId>
         <artifactId>camel-salesforce-maven-plugin</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel.maven</groupId>
         <artifactId>camel-servicenow-maven-plugin</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel.springboot</groupId>
@@ -1935,7 +1935,7 @@
       <dependency>
         <groupId>org.apache.camel.tests</groupId>
         <artifactId>org.apache.camel.tests.mock-javamail_1.7</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -1945,18 +1945,18 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-allcomponents</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-amqp</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-api</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -1996,12 +1996,12 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-attachments</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-avro</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2041,12 +2041,12 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws2-cw</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws2-ddb</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2076,7 +2076,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws2-kinesis</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2086,7 +2086,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws2-lambda</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2101,7 +2101,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws2-s3</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2111,12 +2111,12 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws2-sns</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws2-sqs</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2141,7 +2141,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-azure-eventhubs</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2156,12 +2156,12 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-azure-servicebus</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-azure-storage-blob</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2171,7 +2171,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-azure-storage-queue</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2181,12 +2181,12 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-base</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-base-engine</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2196,17 +2196,17 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-bean</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-bean-validator</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-bindy</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2231,7 +2231,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-browse</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2241,22 +2241,22 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-cassandraql</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-catalog</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-catalog-console</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-catalog-lucene</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2286,22 +2286,22 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-cli-connector</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-cloud</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-cloudevents</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-cluster</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2321,12 +2321,12 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-componentdsl</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-console</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2336,12 +2336,12 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-controlbus</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-core</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2352,37 +2352,37 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-core-catalog</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-core-engine</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-core-languages</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-core-model</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-core-processor</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-core-reifier</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-core-xml</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2397,12 +2397,12 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-cron</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-crypto</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2422,52 +2422,52 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-cxf-common</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-cxf-rest</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-cxf-soap</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-cxf-spring-common</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-cxf-spring-rest</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-cxf-spring-soap</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-cxf-spring-transport</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-cxf-transport</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-dataformat</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-dataset</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2532,7 +2532,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-direct</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2567,12 +2567,12 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-dsl-modeline</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-dsl-support</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2587,7 +2587,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-elasticsearch</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2597,12 +2597,12 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-endpointdsl</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-endpointdsl-support</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2627,17 +2627,17 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-fhir</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-fhir-api</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-file</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2667,7 +2667,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-ftp</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2687,7 +2687,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-google-bigquery</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2712,7 +2712,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-google-pubsub</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2762,12 +2762,12 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-grpc</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-gson</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2797,27 +2797,27 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-health</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-hl7</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-http</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-http-base</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-http-common</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2877,17 +2877,17 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-infinispan</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-infinispan-common</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-infinispan-embedded</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2912,22 +2912,22 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-jackson</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-jackson-avro</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-jackson-protobuf</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-jacksonxml</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2937,7 +2937,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-java-joor-dsl</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2947,7 +2947,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-jaxb</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2977,7 +2977,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-jdbc</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -2992,7 +2992,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-jfr</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3007,12 +3007,12 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-jira</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-jms</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3037,7 +3037,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-jpa</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3062,7 +3062,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-jslt</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3092,7 +3092,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-jsonpath</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3102,42 +3102,42 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-jta</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-kafka</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-kamelet</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-kamelet-main</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-knative</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-knative-api</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-knative-http</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-kubernetes</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3147,12 +3147,12 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-language</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-ldap</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3167,7 +3167,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-log</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3192,37 +3192,37 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-mail</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-mail-microsoft-oauth</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-main</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-management</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-management-api</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-mapstruct</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-master</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3232,22 +3232,22 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-micrometer</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-microprofile-config</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-microprofile-fault-tolerance</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-microprofile-health</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3257,22 +3257,22 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-minio</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-mllp</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-mock</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-mongodb</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3292,22 +3292,22 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-mybatis</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-nats</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-netty</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-netty-http</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3342,17 +3342,17 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-olingo4</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-olingo4-api</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-openapi-java</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3367,7 +3367,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-opentelemetry</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3377,12 +3377,12 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-paho</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-paho-mqtt5</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3407,17 +3407,17 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-platform-http</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-platform-http-main</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-platform-http-vertx</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3452,7 +3452,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-quartz</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3487,7 +3487,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-ref</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3497,7 +3497,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-resilience4j</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3507,12 +3507,12 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-rest</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-rest-openapi</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3542,12 +3542,12 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-saga</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-salesforce</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3562,12 +3562,12 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-saxon</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-scheduler</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3577,7 +3577,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-seda</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3592,7 +3592,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-servlet</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3612,7 +3612,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-slack</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3627,17 +3627,17 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-snmp</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-soap</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-splunk</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3647,57 +3647,57 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-spring</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-spring-batch</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-spring-jdbc</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-spring-ldap</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-spring-main</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-spring-rabbitmq</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-spring-redis</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-spring-security</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-spring-ws</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-spring-xml</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-sql</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3732,12 +3732,12 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-stub</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-support</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3757,17 +3757,17 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-telegram</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-test</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-test-junit5</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3777,7 +3777,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-test-spring-junit5</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3797,27 +3797,27 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-timer</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-tooling-maven</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-tooling-model</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-tooling-util</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-tracing</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3832,12 +3832,12 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-undertow</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-undertow-spring-security</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3847,22 +3847,22 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-util</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-util-json</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-validator</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-velocity</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3872,17 +3872,17 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-vertx-common</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-vertx-http</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-vertx-websocket</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3902,7 +3902,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-webhook</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3927,27 +3927,27 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-xj</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-xml-io</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-xml-io-dsl</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-xml-io-util</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-xml-jaxb</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3957,12 +3957,12 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-xml-jaxp</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-xml-jaxp-util</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -3977,37 +3977,37 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-xpath</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-xslt</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-xslt-saxon</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-yaml-dsl</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-yaml-dsl-common</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-yaml-dsl-deserializers</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-yaml-io</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -4022,12 +4022,12 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-zip-deflater</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-zipfile</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
@@ -4047,7 +4047,7 @@
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>spi-annotations</artifactId>
-        <version>4.0.0.redhat-00010</version>
+        <version>4.0.0.redhat-00025</version>
       </dependency>
       <dependency>
         <groupId>org.apache.maven.plugin-tools</groupId>
@@ -4082,7 +4082,7 @@
       <dependency>
         <groupId>org.fusesource</groupId>
         <artifactId>camel-sap</artifactId>
-        <version>4.0.0.redhat-00044</version>
+        <version>4.0.0.redhat-00059</version>
       </dependency>
       <dependency>
         <groupId>org.fusesource</groupId>
@@ -4092,7 +4092,7 @@
       <dependency>
         <groupId>org.xerial.snappy</groupId>
         <artifactId>snappy-java</artifactId>
-        <version>1.1.10.3</version>
+        <version>1.1.10.4</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
index f755089b317..0ba4d67aa4f 100644
--- a/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom-generator/src/main/resources/pom.xml
@@ -113,6 +113,42 @@
                 <artifactId>guava</artifactId>
                 <version>${guava-version}</version>
             </dependency>
+            <!-- Overrides for tomcat -->
+            <dependency>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>tomcat-annotations-api</artifactId>
+                <version>${tomcat-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>tomcat-jdbc</artifactId>
+                <version>${tomcat-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>tomcat-jsp-api</artifactId>
+                <version>${tomcat-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat.embed</groupId>
+                <artifactId>tomcat-embed-core</artifactId>
+                <version>${tomcat-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat.embed</groupId>
+                <artifactId>tomcat-embed-el</artifactId>
+                <version>${tomcat-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat.embed</groupId>
+                <artifactId>tomcat-embed-jasper</artifactId>
+                <version>${tomcat-version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat.embed</groupId>
+                <artifactId>tomcat-embed-websocket</artifactId>
+                <version>${tomcat-version}</version>
+            </dependency>
             <!-- Overrides avro dependency version since SB's jackson version's takes precedence in camel-jackson-avro-starter -->
             <dependency>
                 <groupId>org.apache.avro</groupId>
diff --git a/tooling/redhat-camel-spring-boot-bom/pom.xml b/tooling/redhat-camel-spring-boot-bom/pom.xml
index 32b62fab04a..a0d9e74d5ae 100644
--- a/tooling/redhat-camel-spring-boot-bom/pom.xml
+++ b/tooling/redhat-camel-spring-boot-bom/pom.xml
@@ -73,14 +73,14 @@
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-bom</artifactId>
-                <version>4.1.96.Final</version>
+                <version>4.1.100.Final-redhat-00001</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-bom</artifactId>
-                <version>11.0.15</version>
+                <version>11.0.17.redhat-00001</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -100,36 +100,72 @@
             <dependency>
                 <groupId>io.undertow</groupId>
                 <artifactId>undertow-core</artifactId>
-                <version>2.3.7.Final</version>
+                <version>2.3.7.Final-redhat-00001</version>
             </dependency>
             <dependency>
                 <groupId>io.undertow</groupId>
                 <artifactId>undertow-servlet</artifactId>
-                <version>2.3.7.Final</version>
+                <version>2.3.7.Final-redhat-00001</version>
             </dependency>
             <!-- Overrides guava -->
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>32.1.2-jre</version>
+                <version>32.1.2.jre-redhat-00001</version>
+            </dependency>
+            <!-- Overrides for tomcat -->
+            <dependency>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>tomcat-annotations-api</artifactId>
+                <version>10.1.14</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>tomcat-jdbc</artifactId>
+                <version>10.1.14</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>tomcat-jsp-api</artifactId>
+                <version>10.1.14</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat.embed</groupId>
+                <artifactId>tomcat-embed-core</artifactId>
+                <version>10.1.14</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat.embed</groupId>
+                <artifactId>tomcat-embed-el</artifactId>
+                <version>10.1.14</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat.embed</groupId>
+                <artifactId>tomcat-embed-jasper</artifactId>
+                <version>10.1.14</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat.embed</groupId>
+                <artifactId>tomcat-embed-websocket</artifactId>
+                <version>10.1.14</version>
             </dependency>
             <!-- Overrides avro dependency version since SB's jackson version's takes precedence in camel-jackson-avro-starter -->
             <dependency>
                 <groupId>org.apache.avro</groupId>
                 <artifactId>avro</artifactId>
-                <version>1.11.0</version>
+                <version>1.11.3</version>
             </dependency>
             <!-- Override commons-compress version -->
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-compress</artifactId>
-                <version>1.21</version>
+                <version>1.24.0</version>
             </dependency>
             <!-- Overrides snappy-java -->
             <dependency>
                 <groupId>org.xerial.snappy</groupId>
                 <artifactId>snappy-java</artifactId>
-                <version>${snappy-java-version}</version>
+                <version>1.1.10.4</version>
             </dependency>
             <!-- Overrides elastic-search dependency since SB is using an older version -->
             <dependency>
@@ -185,7 +221,7 @@
             <dependency>
                 <groupId>org.infinispan</groupId>
                 <artifactId>infinispan-bom</artifactId>
-                <version>14.0.11.Final</version>
+                <version>14.0.18.Final</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -209,7 +245,7 @@
             <dependency>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-bom</artifactId>
-                <version>4.0.2</version>
+                <version>4.0.2.fuse-redhat-00040</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>