You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2022/11/25 21:05:19 UTC

[camel] branch jakarta-rewritten updated (350a964c4cb -> 61163081ba4)

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

gnodet pushed a change to branch jakarta-rewritten
in repository https://gitbox.apache.org/repos/asf/camel.git


 discard 350a964c4cb Upgrade dependencies
 discard ca4e696304e Migration to Jetty 11
 discard 35acf3d50c9 Switch javax packages to jakarta
 discard 3ca8f90700f Add support for jakarta in checkstyle
 discard 12fcd3c6992 Switch to javax.annotation.processing.Generated
 discard e2561c287dc Remove OSGi support
 discard 85c81b0f78c Switch to 4.0.0-SNAPSHOT
 discard c123c3032a0 Rewrite script
     add 83d6774519e Remove duplicate dependency
     new 4d8fec537e7 Rewrite script
     new cc82f0cd7e2 Switch to 4.0.0-SNAPSHOT
     new 55e462f8c8c Remove OSGi support
     new cfdcf7626c1 Switch to javax.annotation.processing.Generated
     new 41d7c3a402f Add support for jakarta in checkstyle
     new 26ca1b929bc Switch javax packages to jakarta
     new 80091807ad7 Migration to Jetty 11
     new 61163081ba4 Upgrade dependencies

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (350a964c4cb)
            \
             N -- N -- N   refs/heads/jakarta-rewritten (61163081ba4)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 camel-dependencies/pom.xml          | 2 +-
 components/camel-spring-xml/pom.xml | 6 ------
 jakarta/transform.sh                | 2 +-
 parent/pom.xml                      | 2 +-
 4 files changed, 3 insertions(+), 9 deletions(-)


[camel] 03/08: Remove OSGi support

Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch jakarta-rewritten
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 55e462f8c8cdc14cb4efafe7a8e1e5006ba99aaa
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Nov 25 21:54:52 2022 +0100

    Remove OSGi support
---
 bom/pom.xml                                        |   1 -
 camel-dependencies/pom.xml                         |  25 -
 catalog/camel-catalog-console/pom.xml              |   4 -
 catalog/camel-catalog-lucene/pom.xml               |   4 -
 catalog/pom.xml                                    |  18 -
 components/camel-amqp/pom.xml                      |   6 -
 components/camel-asterisk/pom.xml                  |   3 -
 components/camel-atmosphere-websocket/pom.xml      |  13 -
 components/camel-atom/pom.xml                      |   3 -
 components/camel-attachments/pom.xml               |   3 -
 .../camel-azure/camel-azure-cosmosdb/pom.xml       |   6 -
 .../camel-azure/camel-azure-eventhubs/pom.xml      |   6 -
 .../camel-azure/camel-azure-servicebus/pom.xml     |   6 -
 components/camel-bonita/pom.xml                    |   3 -
 components/camel-box/camel-box-api/pom.xml         |   3 -
 components/camel-braintree/pom.xml                 |   1 -
 components/camel-caffeine-lrucache/pom.xml         |  29 --
 components/camel-cmis/pom.xml                      |   3 -
 components/camel-cometd/pom.xml                    |   5 -
 components/camel-cxf/camel-cxf-common/pom.xml      |  32 --
 components/camel-cxf/camel-cxf-rest/pom.xml        |  35 --
 components/camel-cxf/camel-cxf-soap/pom.xml        |  35 --
 .../camel-cxf/camel-cxf-spring-common/pom.xml      |  32 --
 components/camel-cxf/camel-cxf-spring-rest/pom.xml |  36 --
 components/camel-cxf/camel-cxf-spring-soap/pom.xml |  35 --
 .../camel-cxf/camel-cxf-spring-transport/pom.xml   |  21 +-
 components/camel-cxf/camel-cxf-transport/pom.xml   |  20 +-
 .../camel-debezium-maven-plugin/pom.xml            |  17 -
 components/camel-fhir/camel-fhir-component/pom.xml |   4 -
 components/camel-flatpack/pom.xml                  |   3 -
 components/camel-freemarker/pom.xml                |   3 -
 components/camel-ftp/pom.xml                       |   3 -
 .../camel-google/camel-google-calendar/pom.xml     |   1 -
 components/camel-google/camel-google-drive/pom.xml |   1 -
 components/camel-google/camel-google-mail/pom.xml  |   1 -
 .../camel-google/camel-google-pubsub/pom.xml       |   1 -
 .../camel-google/camel-google-sheets/pom.xml       |   1 -
 components/camel-gora/pom.xml                      |   4 -
 components/camel-groovy/pom.xml                    |  11 -
 components/camel-hazelcast/pom.xml                 |   3 -
 components/camel-hdfs/pom.xml                      |  14 -
 components/camel-hl7/pom.xml                       |   3 -
 components/camel-http-common/pom.xml               |   4 -
 components/camel-http/pom.xml                      |   3 -
 components/camel-ical/pom.xml                      |   5 -
 components/camel-jackson-avro/pom.xml              |   3 -
 components/camel-jackson-protobuf/pom.xml          |   3 -
 components/camel-jackson/pom.xml                   |   3 -
 components/camel-jacksonxml/pom.xml                |   3 -
 components/camel-jasypt/pom.xml                    |   9 -
 components/camel-jaxb/pom.xml                      |   5 -
 components/camel-jclouds/pom.xml                   |   3 -
 components/camel-jetty-common/pom.xml              |   4 -
 components/camel-jetty/pom.xml                     |   5 -
 components/camel-jms/pom.xml                       |   2 -
 components/camel-jmx/pom.xml                       |   4 -
 components/camel-jpa/pom.xml                       |   8 -
 components/camel-jsch/pom.xml                      |   3 -
 components/camel-jsonpath/pom.xml                  |   5 -
 components/camel-kubernetes/pom.xml                |   4 -
 components/camel-leveldb/pom.xml                   |   8 -
 components/camel-lucene/pom.xml                    |   3 -
 components/camel-mail/pom.xml                      |   3 -
 components/camel-milo/pom.xml                      |   4 -
 components/camel-mina/pom.xml                      |   1 -
 components/camel-mybatis/pom.xml                   |   3 -
 components/camel-olingo2/camel-olingo2-api/pom.xml |   3 -
 .../camel-olingo2/camel-olingo2-component/pom.xml  |   1 -
 components/camel-olingo4/camel-olingo4-api/pom.xml |   3 -
 .../camel-olingo4/camel-olingo4-component/pom.xml  |   1 -
 components/camel-openapi-java/pom.xml              |   4 -
 components/camel-protobuf/pom.xml                  |   3 -
 components/camel-quickfix/pom.xml                  |   4 -
 components/camel-rest-openapi/pom.xml              |   4 -
 .../camel-salesforce-codegen/pom.xml               |  17 -
 .../camel-salesforce-component/pom.xml             |   6 -
 .../camel-salesforce-maven-plugin/pom.xml          |  17 -
 components/camel-saxon/pom.xml                     |   3 -
 .../camel-servicenow-component/pom.xml             |   3 -
 .../camel-servicenow-maven-plugin/pom.xml          |  17 -
 components/camel-servlet/pom.xml                   |   4 -
 components/camel-sjms/pom.xml                      |   4 -
 components/camel-sjms2/pom.xml                     |   1 -
 components/camel-soap/pom.xml                      |   5 -
 components/camel-solr/pom.xml                      |   6 -
 components/camel-splunk/pom.xml                    |   3 -
 components/camel-spring-batch/pom.xml              |   2 -
 components/camel-spring-integration/pom.xml        |   4 -
 components/camel-spring-ldap/pom.xml               |   4 -
 components/camel-spring-security/pom.xml           |   2 -
 components/camel-spring-ws/pom.xml                 |   8 -
 components/camel-spring-xml/pom.xml                |  14 -
 components/camel-stax/pom.xml                      |   4 -
 components/camel-swagger-java/pom.xml              |   3 -
 components/camel-syslog/pom.xml                    |   4 -
 components/camel-twilio/pom.xml                    |   1 -
 components/camel-undertow/pom.xml                  |   3 -
 .../camel-vertx-kafka-maven-plugin/pom.xml         |  17 -
 components/camel-websocket-jsr356/pom.xml          |   6 -
 components/camel-websocket/pom.xml                 |   7 -
 components/camel-wordpress/pom.xml                 |   3 -
 components/camel-xslt-saxon/pom.xml                |   3 -
 components/camel-xstream/pom.xml                   |   3 -
 components/camel-zookeeper-master/pom.xml          |   5 -
 components/pom.xml                                 |  58 ---
 core/camel-api/pom.xml                             |   6 -
 core/camel-core-engine/pom.xml                     |  26 --
 core/camel-core-model/pom.xml                      |  14 -
 core/camel-core-processor/pom.xml                  |  14 -
 core/camel-core-reifier/pom.xml                    |  14 -
 core/camel-core-xml/pom.xml                        |   4 -
 core/camel-core/pom.xml                            |  21 -
 core/camel-xml-jaxb/pom.xml                        |  13 -
 core/pom.xml                                       |  51 ---
 dsl/camel-endpointdsl/pom.xml                      |   4 -
 dsl/pom.xml                                        |  49 --
 init/camel-bundle-plugin/pom.xml                   |  82 ----
 .../org/apache/camel/maven/bundle/CamelPlugin.java |  65 ---
 .../apache/felix/bundleplugin/ManifestPlugin.java  | 506 ---------------------
 .../org/apache/felix/bundleplugin/PatchedLog.java  | 116 -----
 .../felix/bundleplugin/VersionCleanerPlugin.java   |  67 ---
 .../src/main/resources/META-INF/LICENSE.txt        | 203 ---------
 .../src/main/resources/META-INF/MANIFEST.MF        |   0
 .../src/main/resources/META-INF/NOTICE.txt         |  14 -
 init/pom.xml                                       |  61 ---
 parent/pom.xml                                     |  40 --
 pom.xml                                            |   1 -
 tests/pom.xml                                      |  17 -
 tests/test-bundles/mock-javamail_1.7/pom.xml       |  13 -
 tests/test-bundles/pom.xml                         |  32 --
 tooling/camel-tooling-model/pom.xml                |  54 ---
 tooling/camel-tooling-util/pom.xml                 |  54 ---
 tooling/camel-util-json/pom.xml                    |  54 ---
 tooling/maven/pom.xml                              |  15 -
 tooling/openapi-rest-dsl-generator/pom.xml         |  52 ---
 tooling/pom.xml                                    |   1 -
 tooling/spi-annotations/pom.xml                    |  55 ---
 tooling/swagger-rest-dsl-generator/pom.xml         |  52 ---
 138 files changed, 2 insertions(+), 2584 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 470dfa18529..34e6b6b6a9d 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -38,7 +38,6 @@
     </modules>
 
     <properties>
-        <camel.osgi.export.pkg />
     </properties>
 
     <build>
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 37fcca96eb7..ae8959886c4 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -60,7 +60,6 @@
     <atlassian-fugue-version>3.0.0</atlassian-fugue-version>
     <atmos-client-version>3.2.1</atmos-client-version>
     <atmosphere-version>2.6.4</atmosphere-version>
-    <atmosphere-version-range>[2.6,3.0)</atmosphere-version-range>
     <avro-ipc-jetty-version>1.11.1</avro-ipc-jetty-version>
     <avro-ipc-netty-version>1.11.1</avro-ipc-netty-version>
     <avro-version>1.11.1</avro-version>
@@ -82,28 +81,11 @@
     <camel.failsafe.forkTimeout>600</camel.failsafe.forkTimeout>
     <camel.osgi.activator></camel.osgi.activator>
     <camel.osgi.dynamic></camel.osgi.dynamic>
-    <camel.osgi.exclude.dependencies>false</camel.osgi.exclude.dependencies>
-    <camel.osgi.export>${camel.osgi.export.pkg};-noimport:=true;${camel.osgi.version}</camel.osgi.export>
-    <camel.osgi.export.pkg>$${replace;{local-packages};;;\;}</camel.osgi.export.pkg>
-    <camel.osgi.failok>false</camel.osgi.failok>
-    <camel.osgi.import>${camel.osgi.import.pkg}</camel.osgi.import>
     <camel.osgi.import.additional></camel.osgi.import.additional>
     <camel.osgi.import.before.defaults></camel.osgi.import.before.defaults>
-    <camel.osgi.import.camel.version>version="[$(version;==;${camel.osgi.version.clean}),$(version;=+;${camel.osgi.version.clean}))"</camel.osgi.import.camel.version>
-    <camel.osgi.import.default.version>[$(version;==;$(@)),$(version;+;$(@)))</camel.osgi.import.default.version>
     <camel.osgi.import.defaults></camel.osgi.import.defaults>
-    <camel.osgi.import.pkg>org.apache.camel.*;${camel.osgi.import.camel.version},
-            ${camel.osgi.import.before.defaults},
-            ${camel.osgi.import.defaults},
-            ${camel.osgi.import.additional},
-            *</camel.osgi.import.pkg>
-    <camel.osgi.import.strict.version>version="[$(version;===;${camel.osgi.version.clean}),$(version;==+;${camel.osgi.version.clean}))"</camel.osgi.import.strict.version>
-    <camel.osgi.manifest>${project.build.outputDirectory}/META-INF/MANIFEST.MF</camel.osgi.manifest>
-    <camel.osgi.private.pkg>!*</camel.osgi.private.pkg>
     <camel.osgi.provide.capability></camel.osgi.provide.capability>
     <camel.osgi.require.capability></camel.osgi.require.capability>
-    <camel.osgi.symbolic.name>${project.groupId}.${project.artifactId}</camel.osgi.symbolic.name>
-    <camel.osgi.version>version=${project.version}</camel.osgi.version>
     <camel.surefire.fork.vmargs>-XX:+ExitOnOutOfMemoryError</camel.surefire.fork.vmargs>
     <camel.surefire.forkCount>1</camel.surefire.forkCount>
     <camel.surefire.forkTimeout>600</camel.surefire.forkTimeout>
@@ -152,7 +134,6 @@
     <curator-version>4.3.0</curator-version>
     <cxf-codegen-plugin-version>3.5.4</cxf-codegen-plugin-version>
     <cxf-version>3.5.4</cxf-version>
-    <cxf-version-range>[3.5,3.6)</cxf-version-range>
     <cxf-xjc-plugin-version>3.3.2</cxf-xjc-plugin-version>
     <cxf-xjc-utils-version>3.3.2</cxf-xjc-utils-version>
     <cxf.codegen.jvmArgs></cxf.codegen.jvmArgs>
@@ -294,7 +275,6 @@
     <javapoet-version>1.11.1</javapoet-version>
     <javassist-version>3.28.0-GA</javassist-version>
     <javax-activation-version>1.2.0</javax-activation-version>
-    <javax-activation-version-range>[0,2)</javax-activation-version-range>
     <javax-annotation-api-version>1.3.2</javax-annotation-api-version>
     <javax-el-api-hibernate-validator-version>3.0.1-b04</javax-el-api-hibernate-validator-version>
     <javax-el-hibernate-validator-version>3.0.1-b10</javax-el-hibernate-validator-version>
@@ -311,7 +291,6 @@
     <jbpm-version>7.64.0.Final</jbpm-version>
     <jcache-bundle-version>1.1.1_1</jcache-bundle-version>
     <jclouds-google-guava-version>27.1-jre</jclouds-google-guava-version>
-    <jclouds-google-guava-version-range>[27.0,28.0)</jclouds-google-guava-version-range>
     <jclouds-version>2.5.0</jclouds-version>
     <jcommander-version>1.72</jcommander-version>
     <jcr-version>2.0</jcr-version>
@@ -380,7 +359,6 @@
     <log4j2-version>2.18.0</log4j2-version>
     <logback-version>1.2.11</logback-version>
     <lucene-version>8.11.1</lucene-version>
-    <lucene-version-range>[8,9)</lucene-version-range>
     <mapstruct-version>1.5.2.Final</mapstruct-version>
     <maven-antrun-plugin-version>1.6</maven-antrun-plugin-version>
     <maven-archetype-packaging-version>2.3</maven-archetype-packaging-version>
@@ -486,7 +464,6 @@
     <scala-datasonnet-version>2.13.9</scala-datasonnet-version>
     <scala-version>2.11.12</scala-version>
     <servicemix-specs-version>2.9.0</servicemix-specs-version>
-    <servlet-version-range>[3,4)</servlet-version-range>
     <shiro-version>1.9.1</shiro-version>
     <shrinkwrap-descriptors-version>2.0.0</shrinkwrap-descriptors-version>
     <shrinkwrap-maven-version>3.6.3</shrinkwrap-maven-version>
@@ -504,7 +481,6 @@
     <snakeyaml-version>1.33</snakeyaml-version>
     <snmp4j-version>2.6.3_1</snmp4j-version>
     <solr-version>8.11.2</solr-version>
-    <solr-version-range>[8,9)</solr-version-range>
     <solr-zookeeper-version>3.6.2</solr-zookeeper-version>
     <spark-version>3.2.2</spark-version>
     <splunk-version>1.9.0_1</splunk-version>
@@ -517,7 +493,6 @@
     <spring-security-version>5.7.5</spring-security-version>
     <spring-vault-core-version>2.3.2</spring-vault-core-version>
     <spring-version>${spring5-version}</spring-version>
-    <spring-version-range>[5,6)</spring-version-range>
     <spring-ws-version>3.1.4</spring-ws-version>
     <spring5-version>5.3.24</spring5-version>
     <sql-maven-plugin-version>1.5</sql-maven-plugin-version>
diff --git a/catalog/camel-catalog-console/pom.xml b/catalog/camel-catalog-console/pom.xml
index b867f87ee32..570b4bbc905 100644
--- a/catalog/camel-catalog-console/pom.xml
+++ b/catalog/camel-catalog-console/pom.xml
@@ -81,10 +81,6 @@
     <build>
         <plugins>
 
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-            </plugin>
 
             <plugin>
                 <groupId>org.apache.camel</groupId>
diff --git a/catalog/camel-catalog-lucene/pom.xml b/catalog/camel-catalog-lucene/pom.xml
index a4058848702..3b8ea6e580f 100644
--- a/catalog/camel-catalog-lucene/pom.xml
+++ b/catalog/camel-catalog-lucene/pom.xml
@@ -84,10 +84,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/catalog/pom.xml b/catalog/pom.xml
index fda78ce3314..f8643d0992e 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -51,24 +51,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-                <version>${project.version}</version>
-                <configuration>
-                    <instructions>
-                    </instructions>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>net.revelc.code.formatter</groupId>
                 <artifactId>formatter-maven-plugin</artifactId>
diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml
index 6a87c35fb02..289e975cb6a 100644
--- a/components/camel-amqp/pom.xml
+++ b/components/camel-amqp/pom.xml
@@ -35,12 +35,6 @@
     <properties>
         <!-- Wrapped qpid-jms-client requires invalid version of the package.
         Remove this after migration to ServiceMix bundles. -->
-        <camel.osgi.import>
-            org.apache.qpid.jms,
-            javax.jms;version="[1.1,3)",
-            ${camel.osgi.import.defaults},
-            *
-        </camel.osgi.import>
     </properties>
 
     <dependencies>
diff --git a/components/camel-asterisk/pom.xml b/components/camel-asterisk/pom.xml
index 73701052b6b..9e018eebc46 100644
--- a/components/camel-asterisk/pom.xml
+++ b/components/camel-asterisk/pom.xml
@@ -32,9 +32,6 @@
     <description>Camel Asterisk to interact with an Asterisk PBX Server</description>
 
     <properties>
-        <camel.osgi.import.before.defaults>
-            org.asteriskjava.*;version="[1.0,4)"
-        </camel.osgi.import.before.defaults>
     </properties>
 
     <dependencies>
diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml
index 85461df8e3b..be86b000280 100644
--- a/components/camel-atmosphere-websocket/pom.xml
+++ b/components/camel-atmosphere-websocket/pom.xml
@@ -33,19 +33,6 @@
     <description>Camel Atmosphere WebSocket Servlet</description>
 
     <properties>
-        <camel.osgi.import.pkg>
-            !org.apache.camel.component.atmosphere.websocket.*,
-            javax.activation.*;version="${javax-activation-version-range}",
-            javax.servlet.*;version="${servlet-version-range}",
-            org.atmosphere.*;version="${atmosphere-version-range}",
-            org.apache.catalina;resolution:=optional,
-            org.apache.catalina.comet;resolution:=optional,
-            org.eclipse.jetty.continuation;version="[9,10)";resolution:=optional,
-            org.eclipse.jetty.server;version="[9,10)";resolution:=optional,
-            org.eclipse.jetty.util.ssl;version="[9,10)";resolution:=optional,
-            ${camel.osgi.import.defaults},
-            *
-        </camel.osgi.import.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-atom/pom.xml b/components/camel-atom/pom.xml
index 6dd7dc3862b..eaf33249e5d 100644
--- a/components/camel-atom/pom.xml
+++ b/components/camel-atom/pom.xml
@@ -32,9 +32,6 @@
     <description>Camel Atom support</description>
 
     <properties>
-        <camel.osgi.import.additional>
-            org.apache.abdera.*;version="[0.4,2)"
-        </camel.osgi.import.additional>
     </properties>
 
     <dependencies>
diff --git a/components/camel-attachments/pom.xml b/components/camel-attachments/pom.xml
index a70bdcdfb19..12dc142b1c7 100644
--- a/components/camel-attachments/pom.xml
+++ b/components/camel-attachments/pom.xml
@@ -33,9 +33,6 @@
     <description>Support for attachments on Camel messages</description>
 
     <properties>
-        <camel.osgi.import.before.defaults>
-            javax.activation.*;version="${javax-activation-version-range}"
-        </camel.osgi.import.before.defaults>
         <firstVersion>3.0.0</firstVersion>
         <label>core</label>
     </properties>
diff --git a/components/camel-azure/camel-azure-cosmosdb/pom.xml b/components/camel-azure/camel-azure-cosmosdb/pom.xml
index 0544f4ef601..70889290db4 100644
--- a/components/camel-azure/camel-azure-cosmosdb/pom.xml
+++ b/components/camel-azure/camel-azure-cosmosdb/pom.xml
@@ -33,12 +33,6 @@
     <description>Camel Azure CosmosDB Component</description>
 
     <properties>
-      <camel.osgi.import.pkg>
-        !org.apache.camel.component.azure.cosmosdb*,
-        reactor*;version="[3,4)",
-        ${camel.osgi.import.defaults},
-        *
-      </camel.osgi.import.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-azure/camel-azure-eventhubs/pom.xml b/components/camel-azure/camel-azure-eventhubs/pom.xml
index 270cd38b5f8..cdcc06ee058 100644
--- a/components/camel-azure/camel-azure-eventhubs/pom.xml
+++ b/components/camel-azure/camel-azure-eventhubs/pom.xml
@@ -33,12 +33,6 @@
     <description>Camel Azure Event Hubs Component</description>
 
     <properties>
-      <camel.osgi.import.pkg>
-        !org.apache.camel.component.azure.eventhubs*,
-        reactor*;version="[3,4)",
-        ${camel.osgi.import.defaults},
-        *
-      </camel.osgi.import.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-azure/camel-azure-servicebus/pom.xml b/components/camel-azure/camel-azure-servicebus/pom.xml
index c0f6eb55f6b..675753ab0ad 100644
--- a/components/camel-azure/camel-azure-servicebus/pom.xml
+++ b/components/camel-azure/camel-azure-servicebus/pom.xml
@@ -33,12 +33,6 @@
     <description>Camel Azure ServiceBus Component</description>
 
     <properties>
-      <camel.osgi.import.pkg>
-        !org.apache.camel.component.azure.eventhubs*,
-        reactor*;version="[3,4)",
-        ${camel.osgi.import.defaults},
-        *
-      </camel.osgi.import.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-bonita/pom.xml b/components/camel-bonita/pom.xml
index d0bf116bb39..5226723b384 100644
--- a/components/camel-bonita/pom.xml
+++ b/components/camel-bonita/pom.xml
@@ -35,9 +35,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <camel.osgi.import.additional>
-            org.apache.cxf.*;version="${cxf-version-range}"
-        </camel.osgi.import.additional>
     </properties>
 
     <dependencies>
diff --git a/components/camel-box/camel-box-api/pom.xml b/components/camel-box/camel-box-api/pom.xml
index 91ce77abfee..f3747a53f0c 100644
--- a/components/camel-box/camel-box-api/pom.xml
+++ b/components/camel-box/camel-box-api/pom.xml
@@ -37,9 +37,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <firstVersion>2.19.0</firstVersion>
-        <camel.osgi.import.pkg>
-            *
-        </camel.osgi.import.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-braintree/pom.xml b/components/camel-braintree/pom.xml
index 2eee50da955..f5fb90be0ad 100644
--- a/components/camel-braintree/pom.xml
+++ b/components/camel-braintree/pom.xml
@@ -41,7 +41,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <camel.osgi.private.pkg>${outPackage}</camel.osgi.private.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-caffeine-lrucache/pom.xml b/components/camel-caffeine-lrucache/pom.xml
index 83e2ef2b5d8..805c86d54dc 100644
--- a/components/camel-caffeine-lrucache/pom.xml
+++ b/components/camel-caffeine-lrucache/pom.xml
@@ -66,35 +66,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-                <version>${project.version}</version>
-                <extensions>false</extensions>
-                <configuration>
-                    <supportIncrementalBuild>true</supportIncrementalBuild>
-                    <noWarningProjectTypes>pom</noWarningProjectTypes>
-                    <excludeDependencies>${camel.osgi.exclude.dependencies}</excludeDependencies>
-                    <instructions>
-                        <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Bundle-SymbolicName>${camel.osgi.symbolic.name}</Bundle-SymbolicName>
-                        <Bundle-Activator>${camel.osgi.activator}</Bundle-Activator>
-                        <Import-Package>${camel.osgi.import}</Import-Package>
-                        <Export-Package>${camel.osgi.export}</Export-Package>
-                        <DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
-                        <Private-Package>${camel.osgi.private.pkg}</Private-Package>
-                        <Require-Capability>${camel.osgi.require.capability}</Require-Capability>
-                        <Provide-Capability>${camel.osgi.provide.capability}</Provide-Capability>
-                        <Fragment-Host>org.apache.camel.camel-support</Fragment-Host>
-                        <Implementation-Title>Apache Camel</Implementation-Title>
-                        <Implementation-Version>${project.version}</Implementation-Version>
-                        <Karaf-Info>Camel;${project.artifactId}=${project.version}</Karaf-Info>
-                        <_versionpolicy>${camel.osgi.import.default.version}</_versionpolicy>
-                        <_failok>${camel.osgi.failok}</_failok>
-                        <_removeheaders>Bnd-LastModified</_removeheaders>
-                    </instructions>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/components/camel-cmis/pom.xml b/components/camel-cmis/pom.xml
index 9ed6d731080..3dda21041cf 100644
--- a/components/camel-cmis/pom.xml
+++ b/components/camel-cmis/pom.xml
@@ -32,9 +32,6 @@
     <description>Camel CMIS which is based on Apache Chemistry support</description>
 
     <properties>
-        <camel.osgi.import>
-            !org.apache.chemistry.opencmis.client.runtime,*
-        </camel.osgi.import>
     </properties>
 
     <dependencies>
diff --git a/components/camel-cometd/pom.xml b/components/camel-cometd/pom.xml
index 85e88b2bbf3..ee7b7a7cd92 100644
--- a/components/camel-cometd/pom.xml
+++ b/components/camel-cometd/pom.xml
@@ -32,11 +32,6 @@
     <description>Camel Cometd support based on Jetty</description>
 
     <properties>
-        <camel.osgi.import.pkg>
-            org.eclipse.jetty.*;version="[9.4,10)",
-            ${camel.osgi.import.defaults},
-            *
-        </camel.osgi.import.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-cxf/camel-cxf-common/pom.xml b/components/camel-cxf/camel-cxf-common/pom.xml
index 5cca062f82b..04e2e075464 100644
--- a/components/camel-cxf/camel-cxf-common/pom.xml
+++ b/components/camel-cxf/camel-cxf-common/pom.xml
@@ -33,38 +33,6 @@
     <description>Camel CXF Common</description>
 
     <properties>
-        <camel.osgi.import.defaults />
-        <camel.osgi.import>
-            !org.springframework.boot.*,
-            !org.springframework.context.annotation.*;resolution:=optional,
-            !org.apache.camel.component.cxf,
-            !org.apache.camel.component.cxf.blueprint,
-            !org.apache.camel.component.cxf.converter,
-            !org.apache.camel.component.cxf.feature,
-            !org.apache.camel.component.cxf.interceptors,
-            !org.apache.camel.component.cxf.jaxrs,
-            !org.apache.camel.component.cxf.spring,
-            !org.apache.camel.component.cxf.util,
-            !org.apache.camel.blueprint,
-            !org.apache.camel.test,
-            javax.xml.soap*;version="[1.3,2)";resolution:=optional,
-            javax.xml.stream*;version="[0.0,2)";resolution:=optional,
-            org.apache.camel.*;${camel.osgi.import.camel.version},
-            org.apache.camel.component.cxf.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
-            org.apache.camel.component.cxf.jaxrs.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
-            org.apache.cxf.*;version="${cxf-version-range}",
-            ${camel.osgi.import.defaults},
-            ${camel.osgi.import.additional},
-            org.osgi.service.blueprint;resolution:=optional,
-            org.osgi.service.blueprint.container;resolution:=optional,
-            org.osgi.service.blueprint.reflect;resolution:=optional,
-            org.apache.aries.blueprint;version="[1.0,2.0)";resolution:=optional,
-            org.apache.aries.blueprint.reflect;version="[1.0,2.0)";resolution:=optional,
-            org.apache.aries.blueprint.mutable;version="[1.0,2.0)";resolution:=optional,
-            org.apache.camel.blueprint;resolution:=optional,
-            *
-        </camel.osgi.import>
-        <camel.osgi.failok>true</camel.osgi.failok>
 
         <camel-prepare-component>false</camel-prepare-component>
 
diff --git a/components/camel-cxf/camel-cxf-rest/pom.xml b/components/camel-cxf/camel-cxf-rest/pom.xml
index b2a8123727e..29babefc081 100644
--- a/components/camel-cxf/camel-cxf-rest/pom.xml
+++ b/components/camel-cxf/camel-cxf-rest/pom.xml
@@ -33,41 +33,6 @@
     <description>Camel CXF REST support</description>
 
     <properties>
-        <camel.osgi.import.defaults />
-        <camel.osgi.import>
-            !org.springframework.boot.*,
-            !org.springframework.context.annotation.*;resolution:=optional,
-            !org.apache.camel.component.cxf,
-            !org.apache.camel.component.cxf.blueprint,
-            !org.apache.camel.component.cxf.converter,
-            !org.apache.camel.component.cxf.feature,
-            !org.apache.camel.component.cxf.interceptors,
-            !org.apache.camel.component.cxf.jaxrs,
-            !org.apache.camel.component.cxf.spring,
-            !org.apache.camel.blueprint,
-            javax.activation.*;version="${javax-activation-version-range}",
-            javax.jws*;version="[0.0,3)";resolution:=optional,
-            javax.ws.rs*;version="[0.0,3)",
-            javax.xml.soap*;version="[1.3,2)";resolution:=optional,
-            javax.xml.stream*;version="[0.0,2)";resolution:=optional,
-            javax.xml.ws*;version="[0.0,3.0)";resolution:=optional,
-            org.apache.camel.*;${camel.osgi.import.camel.version},
-            org.apache.camel.component.cxf.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
-            org.apache.camel.component.cxf.jaxrs.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
-            org.apache.cxf.*;version="${cxf-version-range}",
-            ${camel.osgi.import.defaults},
-            ${camel.osgi.import.additional},
-            org.osgi.service.blueprint;resolution:=optional,
-            org.osgi.service.blueprint.container;resolution:=optional,
-            org.osgi.service.blueprint.reflect;resolution:=optional,
-            org.apache.aries.blueprint;version="[1.0,2.0)";resolution:=optional,
-            org.apache.aries.blueprint.reflect;version="[1.0,2.0)";resolution:=optional,
-            org.apache.aries.blueprint.mutable;version="[1.0,2.0)";resolution:=optional,
-            org.apache.camel.blueprint;resolution:=optional,
-            *
-        </camel.osgi.import>
-        <camel.osgi.private.pkg />
-        <camel.osgi.failok>true</camel.osgi.failok>
 
     </properties>
 
diff --git a/components/camel-cxf/camel-cxf-soap/pom.xml b/components/camel-cxf/camel-cxf-soap/pom.xml
index 39b9e651bd2..f69dcac0d6e 100644
--- a/components/camel-cxf/camel-cxf-soap/pom.xml
+++ b/components/camel-cxf/camel-cxf-soap/pom.xml
@@ -33,41 +33,6 @@
     <description>Camel CXF SOAP support</description>
 
     <properties>
-        <camel.osgi.import.defaults />
-        <camel.osgi.import>
-            !org.springframework.boot.*,
-            !org.springframework.context.annotation.*;resolution:=optional,
-            !org.apache.camel.component.cxf,
-            !org.apache.camel.component.cxf.blueprint,
-            !org.apache.camel.component.cxf.converter,
-            !org.apache.camel.component.cxf.feature,
-            !org.apache.camel.component.cxf.interceptors,
-            !org.apache.camel.component.cxf.jaxrs,
-            !org.apache.camel.component.cxf.spring*,
-            !org.apache.camel.component.cxf.util,
-            !org.apache.camel.blueprint,
-            javax.activation.*;version="${javax-activation-version-range}",
-            javax.jws*;version="[0.0,3)",
-            javax.ws.rs*;version="[0.0,3)",
-            javax.xml.soap*;version="[1.3,2)",
-            javax.xml.stream*;version="[0.0,2)",
-            javax.xml.ws*;version="[0.0,3.0)",
-            org.apache.camel.*;${camel.osgi.import.camel.version},
-            org.apache.camel.component.cxf.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
-            org.apache.camel.component.cxf.jaxrs.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
-            org.apache.cxf.*;version="${cxf-version-range}",
-            ${camel.osgi.import.defaults},
-            ${camel.osgi.import.additional},
-            org.osgi.service.blueprint;resolution:=optional,
-            org.osgi.service.blueprint.container;resolution:=optional,
-            org.osgi.service.blueprint.reflect;resolution:=optional,
-            org.apache.aries.blueprint;version="[1.0,2.0)";resolution:=optional,
-            org.apache.aries.blueprint.reflect;version="[1.0,2.0)";resolution:=optional,
-            org.apache.aries.blueprint.mutable;version="[1.0,2.0)";resolution:=optional,
-            org.apache.camel.blueprint;resolution:=optional,
-            *
-        </camel.osgi.import>
-        <camel.osgi.failok>true</camel.osgi.failok>
 
     </properties>
 
diff --git a/components/camel-cxf/camel-cxf-spring-common/pom.xml b/components/camel-cxf/camel-cxf-spring-common/pom.xml
index 6bdd6142abe..3b58c7287ac 100644
--- a/components/camel-cxf/camel-cxf-spring-common/pom.xml
+++ b/components/camel-cxf/camel-cxf-spring-common/pom.xml
@@ -33,38 +33,6 @@
     <description>Camel CXF Spring Common</description>
 
     <properties>
-        <camel.osgi.import.defaults />
-        <camel.osgi.import>
-            !org.springframework.boot.*,
-            !org.springframework.context.annotation.*;resolution:=optional,
-            !org.apache.camel.component.cxf,
-            !org.apache.camel.component.cxf.blueprint,
-            !org.apache.camel.component.cxf.converter,
-            !org.apache.camel.component.cxf.feature,
-            !org.apache.camel.component.cxf.interceptors,
-            !org.apache.camel.component.cxf.jaxrs,
-            !org.apache.camel.component.cxf.spring,
-            !org.apache.camel.component.cxf.util,
-            !org.apache.camel.blueprint,
-            javax.xml.soap*;version="[1.3,2)";resolution:=optional,
-            javax.xml.stream*;version="[0.0,2)";resolution:=optional,
-            org.apache.camel.*;${camel.osgi.import.camel.version},
-            org.apache.camel.component.cxf.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
-            org.apache.camel.component.cxf.jaxrs.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
-            org.springframework*;version="${spring-version-range}";resolution:=optional,
-            org.apache.cxf.*;version="${cxf-version-range}",
-            ${camel.osgi.import.defaults},
-            ${camel.osgi.import.additional},
-            org.osgi.service.blueprint;resolution:=optional,
-            org.osgi.service.blueprint.container;resolution:=optional,
-            org.osgi.service.blueprint.reflect;resolution:=optional,
-            org.apache.aries.blueprint;version="[1.0,2.0)";resolution:=optional,
-            org.apache.aries.blueprint.reflect;version="[1.0,2.0)";resolution:=optional,
-            org.apache.aries.blueprint.mutable;version="[1.0,2.0)";resolution:=optional,
-            org.apache.camel.blueprint;resolution:=optional,
-            *
-        </camel.osgi.import>
-        <camel.osgi.failok>true</camel.osgi.failok>
 
         <camel-prepare-component>false</camel-prepare-component>
 
diff --git a/components/camel-cxf/camel-cxf-spring-rest/pom.xml b/components/camel-cxf/camel-cxf-spring-rest/pom.xml
index 6a53451a6cd..5f5e42444cc 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/pom.xml
+++ b/components/camel-cxf/camel-cxf-spring-rest/pom.xml
@@ -34,42 +34,6 @@
 
     <properties>
         <firstVersion>3.18.0</firstVersion>
-        <camel.osgi.import.defaults />
-        <camel.osgi.import>
-            !org.springframework.boot.*,
-            !org.springframework.context.annotation.*;resolution:=optional,
-            !org.apache.camel.component.cxf,
-            !org.apache.camel.component.cxf.blueprint,
-            !org.apache.camel.component.cxf.converter,
-            !org.apache.camel.component.cxf.feature,
-            !org.apache.camel.component.cxf.interceptors,
-            !org.apache.camel.component.cxf.jaxrs,
-            !org.apache.camel.component.cxf.spring,
-            !org.apache.camel.component.cxf.util,
-            !org.apache.camel.blueprint,
-            javax.activation.*;version="${javax-activation-version-range}",
-            javax.jws*;version="[0.0,3)";resolution:=optional,
-            javax.ws.rs*;version="[0.0,3)",
-            javax.xml.soap*;version="[1.3,2)";resolution:=optional,
-            javax.xml.stream*;version="[0.0,2)";resolution:=optional,
-            javax.xml.ws*;version="[0.0,3.0)";resolution:=optional,
-            org.apache.camel.*;${camel.osgi.import.camel.version},
-            org.apache.camel.component.cxf.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
-            org.apache.camel.component.cxf.jaxrs.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
-            org.springframework*;version="${spring-version-range}";resolution:=optional,
-            org.apache.cxf.*;version="${cxf-version-range}",
-            ${camel.osgi.import.defaults},
-            ${camel.osgi.import.additional},
-            org.osgi.service.blueprint;resolution:=optional,
-            org.osgi.service.blueprint.container;resolution:=optional,
-            org.osgi.service.blueprint.reflect;resolution:=optional,
-            org.apache.aries.blueprint;version="[1.0,2.0)";resolution:=optional,
-            org.apache.aries.blueprint.reflect;version="[1.0,2.0)";resolution:=optional,
-            org.apache.aries.blueprint.mutable;version="[1.0,2.0)";resolution:=optional,
-            org.apache.camel.blueprint;resolution:=optional,
-            *
-        </camel.osgi.import>
-        <camel.osgi.failok>true</camel.osgi.failok>
 
     </properties>
 
diff --git a/components/camel-cxf/camel-cxf-spring-soap/pom.xml b/components/camel-cxf/camel-cxf-spring-soap/pom.xml
index 689373d39f1..1d6fa588574 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/pom.xml
+++ b/components/camel-cxf/camel-cxf-spring-soap/pom.xml
@@ -34,41 +34,6 @@
 
     <properties>
         <firstVersion>3.18.0</firstVersion>
-        <camel.osgi.import.defaults />
-        <camel.osgi.import>
-            !org.springframework.boot.*,
-            !org.springframework.context.annotation.*;resolution:=optional,
-            !org.apache.camel.component.cxf,
-            !org.apache.camel.component.cxf.blueprint,
-            !org.apache.camel.component.cxf.converter,
-            !org.apache.camel.component.cxf.feature,
-            !org.apache.camel.component.cxf.interceptors,
-            !org.apache.camel.component.cxf.jaxrs,
-            !org.apache.camel.component.cxf.spring,
-            !org.apache.camel.component.cxf.util,
-            !org.apache.camel.blueprint,
-            javax.activation.*;version="${javax-activation-version-range}",
-            javax.jws*;version="[0.0,3)",
-            javax.ws.rs*;version="[0.0,3)",
-            javax.xml.soap*;version="[1.3,2)",
-            javax.xml.stream*;version="[0.0,2)",
-            javax.xml.ws*;version="[0.0,3.0)",
-            org.apache.camel.*;${camel.osgi.import.camel.version},
-            org.apache.camel.component.cxf.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
-            org.apache.camel.component.cxf.jaxrs.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
-            org.apache.cxf.*;version="${cxf-version-range}",
-            ${camel.osgi.import.defaults},
-            ${camel.osgi.import.additional},
-            org.osgi.service.blueprint;resolution:=optional,
-            org.osgi.service.blueprint.container;resolution:=optional,
-            org.osgi.service.blueprint.reflect;resolution:=optional,
-            org.apache.aries.blueprint;version="[1.0,2.0)";resolution:=optional,
-            org.apache.aries.blueprint.reflect;version="[1.0,2.0)";resolution:=optional,
-            org.apache.aries.blueprint.mutable;version="[1.0,2.0)";resolution:=optional,
-            org.apache.camel.blueprint;resolution:=optional,
-            *
-        </camel.osgi.import>
-        <camel.osgi.failok>true</camel.osgi.failok>
 
     </properties>
 
diff --git a/components/camel-cxf/camel-cxf-spring-transport/pom.xml b/components/camel-cxf/camel-cxf-spring-transport/pom.xml
index b1e8db3b312..dca5cc21f37 100644
--- a/components/camel-cxf/camel-cxf-spring-transport/pom.xml
+++ b/components/camel-cxf/camel-cxf-spring-transport/pom.xml
@@ -37,26 +37,7 @@
         <label>soap,webservice</label>
         <title>CXF Transport</title>
 
-        <camel.osgi.import>
-            !org.apache.camel.component.cxf.*,
-            !META-INF.cxf.camel,
-            javax.servlet.*;version="${servlet-version-range}",
-            org.apache.camel.*;${camel.osgi.import.camel.version},
-            org.apache.camel.component.cxf.transport.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
-            org.springframework*;version="${spring-version-range}";resolution:=optional,
-            org.apache.cxf.*;version="${cxf-version-range}",
-            ${camel.osgi.import.defaults},
-            ${camel.osgi.import.additional},
-            org.apache.aries.blueprint*;resolution:=optional,
-            org.osgi.service.blueprint*;resolution:=optional,
-            *
-        </camel.osgi.import>
-
-        <camel.osgi.export>
-            org.apache.camel.component.cxf.*;${camel.osgi.version};-split-package:=merge-first,
-            '=META-INF.cxf.camel'
-        </camel.osgi.export>
-        <camel.osgi.failok>true</camel.osgi.failok>
+
 
     </properties>
 
diff --git a/components/camel-cxf/camel-cxf-transport/pom.xml b/components/camel-cxf/camel-cxf-transport/pom.xml
index af73a54c718..2d1a67a23ba 100644
--- a/components/camel-cxf/camel-cxf-transport/pom.xml
+++ b/components/camel-cxf/camel-cxf-transport/pom.xml
@@ -37,25 +37,7 @@
         <label>soap,webservice</label>
         <title>CXF Transport</title>
 
-        <camel.osgi.import>
-            !org.apache.camel.component.cxf.*,
-            !META-INF.cxf.camel,
-            javax.servlet.*;version="${servlet-version-range}",
-            org.apache.camel.*;${camel.osgi.import.camel.version},
-            org.apache.camel.component.cxf.transport.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
-            org.apache.cxf.*;version="${cxf-version-range}",
-            ${camel.osgi.import.defaults},
-            ${camel.osgi.import.additional},
-            org.apache.aries.blueprint*;resolution:=optional,
-            org.osgi.service.blueprint*;resolution:=optional,
-            *
-        </camel.osgi.import>
-
-        <camel.osgi.export>
-            org.apache.camel.component.cxf.*;${camel.osgi.version};-split-package:=merge-first,
-            '=META-INF.cxf.camel'
-        </camel.osgi.export>
-        <camel.osgi.failok>true</camel.osgi.failok>
+
 
     </properties>
 
diff --git a/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/pom.xml b/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/pom.xml
index 2d4f2e7f39b..a91ecb4a461 100644
--- a/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/pom.xml
+++ b/components/camel-debezium/camel-debezium-common/camel-debezium-maven-plugin/pom.xml
@@ -98,23 +98,6 @@
                     </archive>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>none</phase>
-                    </execution>
-                    <execution>
-                        <id>versions</id>
-                        <phase>none</phase>
-                    </execution>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>none</phase>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-package-maven-plugin</artifactId>
diff --git a/components/camel-fhir/camel-fhir-component/pom.xml b/components/camel-fhir/camel-fhir-component/pom.xml
index 52a8c53f803..8ced1876810 100644
--- a/components/camel-fhir/camel-fhir-component/pom.xml
+++ b/components/camel-fhir/camel-fhir-component/pom.xml
@@ -37,10 +37,6 @@
         <schemeName>fhir</schemeName>
         <componentPackage>org.apache.camel.component.fhir</componentPackage>
         <outPackage>org.apache.camel.component.fhir.internal</outPackage>
-        <camel.osgi.dynamic>
-            org.hl7.fhir.*
-        </camel.osgi.dynamic>
-        <camel.osgi.private.pkg>${outPackage}</camel.osgi.private.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-flatpack/pom.xml b/components/camel-flatpack/pom.xml
index cca2ffa7bcf..918f0caf332 100644
--- a/components/camel-flatpack/pom.xml
+++ b/components/camel-flatpack/pom.xml
@@ -32,9 +32,6 @@
     <description>Camel FlatPack support</description>
 
     <properties>
-        <camel.osgi.import.additional>
-            net.sf.flatpack.*;version="[4,5)"
-        </camel.osgi.import.additional>
     </properties>
 
     <dependencies>
diff --git a/components/camel-freemarker/pom.xml b/components/camel-freemarker/pom.xml
index 9fb1275feae..43e470be93a 100644
--- a/components/camel-freemarker/pom.xml
+++ b/components/camel-freemarker/pom.xml
@@ -32,9 +32,6 @@
     <description>Camel Freemarker support</description>
 
     <properties>
-        <camel.osgi.import.additional>
-            freemarker.*;version="[2.3.15,3)"
-        </camel.osgi.import.additional>
     </properties>
 
     <dependencies>
diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
index 910d955b84d..d7bfddf0522 100644
--- a/components/camel-ftp/pom.xml
+++ b/components/camel-ftp/pom.xml
@@ -32,9 +32,6 @@
     <description>Camel FTP support</description>
 
     <properties>
-        <camel.osgi.import.before.defaults>
-            com.jcraft.jsch.*;version="[0.2,1)"
-        </camel.osgi.import.before.defaults>
 
         <camel.failsafe.parallel.factor>0.5</camel.failsafe.parallel.factor>
     </properties>
diff --git a/components/camel-google/camel-google-calendar/pom.xml b/components/camel-google/camel-google-calendar/pom.xml
index 0b4ae679daa..eb8f2a03a7f 100644
--- a/components/camel-google/camel-google-calendar/pom.xml
+++ b/components/camel-google/camel-google-calendar/pom.xml
@@ -37,7 +37,6 @@
         <componentName>GoogleCalendar</componentName>
         <componentPackage>org.apache.camel.component.google.calendar</componentPackage>
         <outPackage>org.apache.camel.component.google.calendar.internal</outPackage>
-        <camel.osgi.private.pkg>org.apache.camel.component.google.calendar.internal</camel.osgi.private.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-google/camel-google-drive/pom.xml b/components/camel-google/camel-google-drive/pom.xml
index e1868efd413..a0a54ec0f83 100644
--- a/components/camel-google/camel-google-drive/pom.xml
+++ b/components/camel-google/camel-google-drive/pom.xml
@@ -37,7 +37,6 @@
         <componentName>GoogleDrive</componentName>
         <componentPackage>org.apache.camel.component.google.drive</componentPackage>
         <outPackage>org.apache.camel.component.google.drive.internal</outPackage>
-        <camel.osgi.private.pkg>org.apache.camel.component.google.drive.internal</camel.osgi.private.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-google/camel-google-mail/pom.xml b/components/camel-google/camel-google-mail/pom.xml
index 522b0a22e93..833dd43c5e3 100644
--- a/components/camel-google/camel-google-mail/pom.xml
+++ b/components/camel-google/camel-google-mail/pom.xml
@@ -37,7 +37,6 @@
         <componentName>GoogleMail</componentName>
         <componentPackage>org.apache.camel.component.google.mail</componentPackage>
         <outPackage>org.apache.camel.component.google.mail.internal</outPackage>
-        <camel.osgi.private.pkg>org.apache.camel.component.google.mail.internal</camel.osgi.private.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-google/camel-google-pubsub/pom.xml b/components/camel-google/camel-google-pubsub/pom.xml
index 8e9167cc9d0..56b7f12fafe 100644
--- a/components/camel-google/camel-google-pubsub/pom.xml
+++ b/components/camel-google/camel-google-pubsub/pom.xml
@@ -36,7 +36,6 @@
         <schemeName>google-pubsub</schemeName>
         <componentName>GooglePubSub</componentName>
         <componentPackage>org.apache.camel.component.google.pubsub</componentPackage>
-        <camel.osgi.import>com.google.common*;version="${google-cloud-guava-version-prefix}",*</camel.osgi.import>
     </properties>
 
     <dependencyManagement>
diff --git a/components/camel-google/camel-google-sheets/pom.xml b/components/camel-google/camel-google-sheets/pom.xml
index b4d69545531..f1954abd943 100644
--- a/components/camel-google/camel-google-sheets/pom.xml
+++ b/components/camel-google/camel-google-sheets/pom.xml
@@ -37,7 +37,6 @@
         <componentName>GoogleSheets</componentName>
         <componentPackage>org.apache.camel.component.google.sheets</componentPackage>
         <outPackage>org.apache.camel.component.google.sheets.internal</outPackage>
-        <camel.osgi.private.pkg>org.apache.camel.component.google.sheets.internal</camel.osgi.private.pkg>
         <spring-security-oauth2-version>2.3.6.RELEASE</spring-security-oauth2-version>
     </properties>
 
diff --git a/components/camel-gora/pom.xml b/components/camel-gora/pom.xml
index 30a76dd9554..364c402b900 100644
--- a/components/camel-gora/pom.xml
+++ b/components/camel-gora/pom.xml
@@ -33,10 +33,6 @@
     <description>Gora Component for Apache Camel</description>
 
     <properties>
-        <camel.osgi.import.before.defaults>
-            com.google.common.base;version="[11,14)",
-            org.apache.hadoop.conf;version="[1,2)"
-        </camel.osgi.import.before.defaults>
     </properties>
 
     <dependencies>
diff --git a/components/camel-groovy/pom.xml b/components/camel-groovy/pom.xml
index 9402e403148..9e3da63666a 100644
--- a/components/camel-groovy/pom.xml
+++ b/components/camel-groovy/pom.xml
@@ -33,17 +33,6 @@
     <description>Camel Groovy support</description>
 
     <properties>
-        <camel.osgi.import.pkg>
-            !org.apache.camel.component.groovy.*,
-            org.codehaus.groovy.runtime.callsite,
-            org.apache.camel.*;${camel.osgi.import.camel.version},
-            ${camel.osgi.import.defaults},
-            *
-        </camel.osgi.import.pkg>
-        <camel.osgi.dynamic>
-            groovy.*,
-            org.codehaus.groovy.*
-        </camel.osgi.dynamic>
     </properties>
 
     <dependencies>
diff --git a/components/camel-hazelcast/pom.xml b/components/camel-hazelcast/pom.xml
index 8a4641449c1..82815a47c81 100644
--- a/components/camel-hazelcast/pom.xml
+++ b/components/camel-hazelcast/pom.xml
@@ -32,9 +32,6 @@
     <description>Camel HazelCast based work queue implementation</description>
 
     <properties>
-        <camel.osgi.import.before.defaults>
-            com.hazelcast.*;version="[5,6)"
-        </camel.osgi.import.before.defaults>
     </properties>
 
     <dependencies>
diff --git a/components/camel-hdfs/pom.xml b/components/camel-hdfs/pom.xml
index c092ee764e2..56f913a852c 100644
--- a/components/camel-hdfs/pom.xml
+++ b/components/camel-hdfs/pom.xml
@@ -32,20 +32,6 @@
     <description>Camel HDFS support with Hadoop 3.x libraries</description>
 
     <properties>
-        <camel.osgi.import.additional>
-            org.apache.hadoop.hdfs,
-            org.apache.hadoop.hdfs.client,
-            org.apache.hadoop.hdfs.protocolPB,
-            org.apache.hadoop.hdfs.util,
-            org.apache.hadoop.hdfs.net,
-            org.apache.hadoop.hdfs.security.token.block,
-            org.apache.hadoop.hdfs.security.token.delegation,
-            org.apache.hadoop.hdfs.protocol,
-            org.apache.hadoop.hdfs.protocol.proto,
-            org.apache.hadoop.hdfs.protocol.datatransfer,
-            org.apache.hadoop.net,
-            org.apache.hadoop.ipc
-        </camel.osgi.import.additional>
     </properties>
 
     <dependencies>
diff --git a/components/camel-hl7/pom.xml b/components/camel-hl7/pom.xml
index 9b54aced79d..c9092fc5e1b 100644
--- a/components/camel-hl7/pom.xml
+++ b/components/camel-hl7/pom.xml
@@ -32,9 +32,6 @@
     <description>Camel HL7 support</description>
 
     <properties>
-        <camel.osgi.import.before.defaults>
-            org.apache.mina.*;version="[2,3)"
-        </camel.osgi.import.before.defaults>
     </properties>
 
     <dependencies>
diff --git a/components/camel-http-common/pom.xml b/components/camel-http-common/pom.xml
index 7e958711681..83b78299a67 100644
--- a/components/camel-http-common/pom.xml
+++ b/components/camel-http-common/pom.xml
@@ -33,10 +33,6 @@
     <description>Camel HTTP common</description>
 
     <properties>
-        <camel.osgi.import.before.defaults>
-            javax.activation.*;version="${javax-activation-version-range}",
-            javax.servlet.*;version="${servlet-version-range}"
-        </camel.osgi.import.before.defaults>
         <firstVersion>2.16.0</firstVersion>
     </properties>
 
diff --git a/components/camel-http/pom.xml b/components/camel-http/pom.xml
index 491e7dc0a9a..41f8817b81d 100644
--- a/components/camel-http/pom.xml
+++ b/components/camel-http/pom.xml
@@ -33,9 +33,6 @@
     <description>Camel HTTP support</description>
 
     <properties>
-        <camel.osgi.import.before.defaults>
-            org.apache.http.*;version="[4.4,5)"
-        </camel.osgi.import.before.defaults>
     </properties>
 
     <dependencies>
diff --git a/components/camel-ical/pom.xml b/components/camel-ical/pom.xml
index f2a4d31e7fe..efb63e1873f 100644
--- a/components/camel-ical/pom.xml
+++ b/components/camel-ical/pom.xml
@@ -33,11 +33,6 @@
     <description>Camel iCal component</description>
 
     <properties>
-        <camel.osgi.import>
-            !org.apache.camel.ical.*,
-            ${camel.osgi.import.defaults},
-            *
-        </camel.osgi.import>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jackson-avro/pom.xml b/components/camel-jackson-avro/pom.xml
index dbd3cba1a97..7a2254ec6f0 100644
--- a/components/camel-jackson-avro/pom.xml
+++ b/components/camel-jackson-avro/pom.xml
@@ -33,9 +33,6 @@
 
     <properties>
         <firstVersion>3.10.0</firstVersion>
-        <camel.osgi.import.before.defaults>
-            com.fasterxml.jackson.*;version="[2.13,3)"
-        </camel.osgi.import.before.defaults>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jackson-protobuf/pom.xml b/components/camel-jackson-protobuf/pom.xml
index eac1572d30b..2c42c759cd0 100644
--- a/components/camel-jackson-protobuf/pom.xml
+++ b/components/camel-jackson-protobuf/pom.xml
@@ -33,9 +33,6 @@
 
     <properties>
     	<firstVersion>3.10.0</firstVersion>
-        <camel.osgi.import.before.defaults>
-            com.fasterxml.jackson.*;version="[2.13,3)"
-        </camel.osgi.import.before.defaults>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jackson/pom.xml b/components/camel-jackson/pom.xml
index a12bf45bbeb..70495cef642 100644
--- a/components/camel-jackson/pom.xml
+++ b/components/camel-jackson/pom.xml
@@ -33,9 +33,6 @@
     <description>Camel Jackson support</description>
 
     <properties>
-        <camel.osgi.import.before.defaults>
-            com.fasterxml.jackson.*;version="[2.13,3)"
-        </camel.osgi.import.before.defaults>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jacksonxml/pom.xml b/components/camel-jacksonxml/pom.xml
index 89c0fdc7c1d..30b29fc04ea 100644
--- a/components/camel-jacksonxml/pom.xml
+++ b/components/camel-jacksonxml/pom.xml
@@ -32,9 +32,6 @@
     <description>Camel Jackson XML support</description>
 
     <properties>
-        <camel.osgi.import.before.defaults>
-            com.fasterxml.jackson.*;version="[2.13,3)"
-        </camel.osgi.import.before.defaults>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jasypt/pom.xml b/components/camel-jasypt/pom.xml
index c0723d66057..08191d94756 100644
--- a/components/camel-jasypt/pom.xml
+++ b/components/camel-jasypt/pom.xml
@@ -36,7 +36,6 @@
         <firstVersion>2.5.0</firstVersion>
         <label>security</label>
 
-        <camel.osgi.import.before.defaults>org.jasypt.encryption.*;version="[1.9,2)"</camel.osgi.import.before.defaults>
     </properties>
 
     <dependencies>
@@ -88,14 +87,6 @@
                         <lifecycleMappingMetadata>
                             <pluginExecutions>
                                 <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>org.apache.camel</groupId>
-                                        <artifactId>camel-bundle-plugin</artifactId>
-                                        <versionRange>${project.version}</versionRange>
-                                        <goals>
-                                            <goal>manifest</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
                                     <action>
                                         <ignore />
                                     </action>
diff --git a/components/camel-jaxb/pom.xml b/components/camel-jaxb/pom.xml
index 75e71746867..9fac8fd10f9 100644
--- a/components/camel-jaxb/pom.xml
+++ b/components/camel-jaxb/pom.xml
@@ -33,11 +33,6 @@
     <description>Camel JAXB support</description>
 
     <properties>
-        <camel.osgi.import>
-            com.sun.xml.bind.marshaller;resolution:=optional;version="[2.2,3)",
-            javax.xml.bind*;version="[2.2,3.0)",
-            *
-        </camel.osgi.import>
         <camel.surefire.parallel>true</camel.surefire.parallel>
     </properties>
 
diff --git a/components/camel-jclouds/pom.xml b/components/camel-jclouds/pom.xml
index 6de1ab8d754..60b07e2c4e5 100644
--- a/components/camel-jclouds/pom.xml
+++ b/components/camel-jclouds/pom.xml
@@ -32,9 +32,6 @@
     <description>Camel JClouds support</description>
 
     <properties>
-        <camel.osgi.import.before.defaults>
-            com.google.common.*;version="${jclouds-google-guava-version-range}",
-        </camel.osgi.import.before.defaults>
 
 
         <!-- jclouds requires guice 3 -->
diff --git a/components/camel-jetty-common/pom.xml b/components/camel-jetty-common/pom.xml
index 4898f3094b6..d3f3df86518 100644
--- a/components/camel-jetty-common/pom.xml
+++ b/components/camel-jetty-common/pom.xml
@@ -33,10 +33,6 @@
     <description>Camel Jetty 9.x support</description>
 
     <properties>
-        <camel.osgi.import.before.defaults>
-            org.eclipse.jetty.*;version="[9.4,10)",
-            javax.servlet.*;version="${servlet-version-range}"
-        </camel.osgi.import.before.defaults>
         <firstVersion>2.15.0</firstVersion>
     </properties>
 
diff --git a/components/camel-jetty/pom.xml b/components/camel-jetty/pom.xml
index 75e38185a51..9a6f516e048 100644
--- a/components/camel-jetty/pom.xml
+++ b/components/camel-jetty/pom.xml
@@ -33,11 +33,6 @@
     <description>Camel Jetty support</description>
 
     <properties>
-        <camel.osgi.import.before.defaults>
-            org.eclipse.jetty.*;version="[9.4,10)",
-            javax.activation.*;version="${javax-activation-version-range}",
-            javax.servlet.*;version="${servlet-version-range}"
-        </camel.osgi.import.before.defaults>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml
index b92a15bd1cf..13538c4de2e 100644
--- a/components/camel-jms/pom.xml
+++ b/components/camel-jms/pom.xml
@@ -34,8 +34,6 @@
     <description>Camel JMS support</description>
 
     <properties>
-        <camel.osgi.export.pkg>org.apache.camel.component.jms*</camel.osgi.export.pkg>
-        <camel.osgi.import.additional>javax.jms;version="[1.1,3)"</camel.osgi.import.additional>
 
         <camel.surefire.reuseForks>true</camel.surefire.reuseForks>
         <camel.surefire.forkCount>1</camel.surefire.forkCount>
diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml
index ee60cfe9276..142c5d4a1c5 100644
--- a/components/camel-jmx/pom.xml
+++ b/components/camel-jmx/pom.xml
@@ -32,10 +32,6 @@
     <description>Camel JMX support</description>
 
     <properties>
-        <camel.osgi.import>
-            javax.xml.bind*;version="[2.2,3.0)",
-            *
-        </camel.osgi.import>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index c24d55bee8d..9c22cd2b7d8 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -32,14 +32,6 @@
     <description>Camel JPA support</description>
 
     <properties>
-        <camel.osgi.import.pkg>
-            org.apache.camel.*;${camel.osgi.import.camel.version},
-            javax.persistence.*;version="[1.1,3)",
-            ${camel.osgi.import.defaults},
-            org.hibernate.proxy;resolution:=optional,
-            javassist.util.proxy;resolution:=optional,
-            *
-        </camel.osgi.import.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jsch/pom.xml b/components/camel-jsch/pom.xml
index c2bbe52cc39..88b9de6633c 100644
--- a/components/camel-jsch/pom.xml
+++ b/components/camel-jsch/pom.xml
@@ -32,9 +32,6 @@
     <description>Camel SCP Support</description>
 
     <properties>
-        <camel.osgi.import.before.defaults>
-            com.jcraft.jsch.*;version="[0.2,1)"
-        </camel.osgi.import.before.defaults>
     </properties>
 
     <dependencies>
diff --git a/components/camel-jsonpath/pom.xml b/components/camel-jsonpath/pom.xml
index 7fac7373c0c..dba8decf904 100644
--- a/components/camel-jsonpath/pom.xml
+++ b/components/camel-jsonpath/pom.xml
@@ -33,11 +33,6 @@
     <description>Camel JSON Path Language</description>
 
     <properties>
-        <camel.osgi.import>
-            com.fasterxml.jackson.databind,
-            com.fasterxml.jackson.module.jaxb;resolution:=optional,
-            *
-        </camel.osgi.import>
     </properties>
 
     <dependencies>
diff --git a/components/camel-kubernetes/pom.xml b/components/camel-kubernetes/pom.xml
index d247324f375..3731a8df38d 100644
--- a/components/camel-kubernetes/pom.xml
+++ b/components/camel-kubernetes/pom.xml
@@ -32,10 +32,6 @@
     <name>Camel :: Kubernetes</name>
 
     <properties>
-        <camel.osgi.export.pkg>
-            org.apache.camel.component.kubernetes*,
-            org.apache.camel.component.openshift*
-        </camel.osgi.export.pkg>
     </properties>
 
     <dependencyManagement>
diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml
index 9d5a3153306..16005bc191d 100644
--- a/components/camel-leveldb/pom.xml
+++ b/components/camel-leveldb/pom.xml
@@ -36,14 +36,6 @@
         <label>database</label>
         <title>LevelDB</title>
 
-        <camel.osgi.import.pkg>
-            org.apache.camel*,
-            org.fusesource.hawtbuf*,
-            org.slf4j,
-            org.fusesource.leveldbjni;resolution:=optional,
-            org.iq80.leveldb;resolution:=optional,
-            org.iq80.leveldb.impl;resolution:=optional
-        </camel.osgi.import.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-lucene/pom.xml b/components/camel-lucene/pom.xml
index b5a33696028..a2d8251e2e6 100644
--- a/components/camel-lucene/pom.xml
+++ b/components/camel-lucene/pom.xml
@@ -32,9 +32,6 @@
     <description>Camel Lucene based search component</description>
 
     <properties>
-        <camel.osgi.import.additional>
-            org.apache.lucene.*;version="${lucene-version-range}"
-        </camel.osgi.import.additional>
     </properties>
 
     <dependencies>
diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml
index 5c5014b0b18..d7ef267fcd6 100644
--- a/components/camel-mail/pom.xml
+++ b/components/camel-mail/pom.xml
@@ -32,9 +32,6 @@
     <description>Camel Mail support</description>
 
     <properties>
-        <camel.osgi.import.before.defaults>
-            javax.activation.*;version="${javax-activation-version-range}"
-        </camel.osgi.import.before.defaults>
     </properties>
 
     <dependencies>
diff --git a/components/camel-milo/pom.xml b/components/camel-milo/pom.xml
index e9274ad6dff..29efdb534b8 100644
--- a/components/camel-milo/pom.xml
+++ b/components/camel-milo/pom.xml
@@ -32,10 +32,6 @@
     <description>Camel OPC UA support</description>
 
     <properties>
-        <camel.osgi.import.before.defaults>
-            javax.xml.bind*;version="[2.2,3.0)",
-            com.google.common.*;version="19.0.0"
-        </camel.osgi.import.before.defaults>
     </properties>
 
     <dependencies>
diff --git a/components/camel-mina/pom.xml b/components/camel-mina/pom.xml
index 72db127f49c..de4618ac16a 100644
--- a/components/camel-mina/pom.xml
+++ b/components/camel-mina/pom.xml
@@ -32,7 +32,6 @@
     <description>Camel MINA support</description>
 
     <properties>
-        <camel.osgi.import.before.defaults>org.apache.mina.*;version="[2.0,3.0)"</camel.osgi.import.before.defaults>
     </properties>
 
     <dependencies>
diff --git a/components/camel-mybatis/pom.xml b/components/camel-mybatis/pom.xml
index 3e9acc63ef6..6cf3e3b2f34 100644
--- a/components/camel-mybatis/pom.xml
+++ b/components/camel-mybatis/pom.xml
@@ -32,9 +32,6 @@
     <description>Camel MyBatis support</description>
 
     <properties>
-        <camel.osgi.import.before.defaults>
-            org.apache.ibatis.*;version="[3,4)"
-        </camel.osgi.import.before.defaults>
     </properties>
 
     <dependencies>
diff --git a/components/camel-olingo2/camel-olingo2-api/pom.xml b/components/camel-olingo2/camel-olingo2-api/pom.xml
index 2b199bd6d39..8c40c8c54ba 100644
--- a/components/camel-olingo2/camel-olingo2-api/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-api/pom.xml
@@ -34,9 +34,6 @@
     <packaging>jar</packaging>
 
     <properties>
-        <camel.osgi.import.pkg>
-            *
-        </camel.osgi.import.pkg>
         <firstVersion>2.14.0</firstVersion>
     </properties>
 
diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml b/components/camel-olingo2/camel-olingo2-component/pom.xml
index eb354a0a433..cd045a8d4eb 100644
--- a/components/camel-olingo2/camel-olingo2-component/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-component/pom.xml
@@ -38,7 +38,6 @@
         <componentPackage>org.apache.camel.component.olingo2</componentPackage>
         <outPackage>org.apache.camel.component.olingo2.internal</outPackage>
 
-        <camel.osgi.private.pkg>${outPackage}</camel.osgi.private.pkg>
         <maven.exe.file.extension />
     </properties>
 
diff --git a/components/camel-olingo4/camel-olingo4-api/pom.xml b/components/camel-olingo4/camel-olingo4-api/pom.xml
index 9385354ca83..546d98d14d3 100644
--- a/components/camel-olingo4/camel-olingo4-api/pom.xml
+++ b/components/camel-olingo4/camel-olingo4-api/pom.xml
@@ -33,9 +33,6 @@
     <packaging>jar</packaging>
 
     <properties>
-        <camel.osgi.import.pkg>
-            *
-        </camel.osgi.import.pkg>
         <firstVersion>2.19.0</firstVersion>
     </properties>
 
diff --git a/components/camel-olingo4/camel-olingo4-component/pom.xml b/components/camel-olingo4/camel-olingo4-component/pom.xml
index 5364fc480d9..f7608e9aba5 100644
--- a/components/camel-olingo4/camel-olingo4-component/pom.xml
+++ b/components/camel-olingo4/camel-olingo4-component/pom.xml
@@ -36,7 +36,6 @@
         <maven.exe.file.extension />
         <componentPackage>org.apache.camel.component.olingo4</componentPackage>
         <outPackage>org.apache.camel.component.olingo4.internal</outPackage>
-        <camel.osgi.private.pkg>${outPackage}</camel.osgi.private.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-openapi-java/pom.xml b/components/camel-openapi-java/pom.xml
index 948a6f23d3e..eae9aac09e6 100644
--- a/components/camel-openapi-java/pom.xml
+++ b/components/camel-openapi-java/pom.xml
@@ -37,10 +37,6 @@
         <firstVersion>3.1.0</firstVersion>
         <label>rest,api</label>
 
-        <camel.osgi.import.before.defaults>
-            com.fasterxml.jackson.*;version="[2.13,3)",
-            io.apicurio.datamodels*
-        </camel.osgi.import.before.defaults>
 
         <camel.surefire.parallel>true</camel.surefire.parallel>
     </properties>
diff --git a/components/camel-protobuf/pom.xml b/components/camel-protobuf/pom.xml
index f368b574a18..2acdbad3a10 100644
--- a/components/camel-protobuf/pom.xml
+++ b/components/camel-protobuf/pom.xml
@@ -33,9 +33,6 @@
     <description>Camel Google Protobuf data format support</description>
 
     <properties>
-        <camel.osgi.import.before.defaults>
-            com.google.protobuf.*;version="[3.1,4)"
-        </camel.osgi.import.before.defaults>
     </properties>
 
     <dependencies>
diff --git a/components/camel-quickfix/pom.xml b/components/camel-quickfix/pom.xml
index 4638c075a23..0bfd4c0c7a7 100644
--- a/components/camel-quickfix/pom.xml
+++ b/components/camel-quickfix/pom.xml
@@ -32,10 +32,6 @@
     <description>Camel QuickFIX/J support</description>
 
     <properties>
-        <camel.osgi.import>
-            org.slf4j*;resolution:=optional,
-            *
-        </camel.osgi.import>
     </properties>
 
     <dependencies>
diff --git a/components/camel-rest-openapi/pom.xml b/components/camel-rest-openapi/pom.xml
index 70126cb0ca6..b24699ba9b1 100644
--- a/components/camel-rest-openapi/pom.xml
+++ b/components/camel-rest-openapi/pom.xml
@@ -36,10 +36,6 @@
     <properties>
         <firstVersion>3.1.0</firstVersion>
         <label>rest,api,http</label>
-        <camel.osgi.import.before.defaults>
-            com.fasterxml.jackson.*;version="[2.13,3)",
-            io.apicurio.datamodels*
-        </camel.osgi.import.before.defaults>
     </properties>
 
     <dependencies>
diff --git a/components/camel-salesforce/camel-salesforce-codegen/pom.xml b/components/camel-salesforce/camel-salesforce-codegen/pom.xml
index af267f8106b..3e99847a927 100644
--- a/components/camel-salesforce/camel-salesforce-codegen/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-codegen/pom.xml
@@ -107,23 +107,6 @@
                     </archive>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>none</phase>
-                    </execution>
-                    <execution>
-                        <id>versions</id>
-                        <phase>none</phase>
-                    </execution>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>none</phase>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-package-maven-plugin</artifactId>
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml
index d4e5548c6b3..ae67073f42d 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -33,12 +33,6 @@
     <description>Camel Salesforce support</description>
 
     <properties>
-        <camel.osgi.import.additional>
-            javax.xml.bind*;version="[2.2,3.0)",
-            org.eclipse.jetty.*;version="[9.4,10)",
-            org.mortbay.cometd.*;version="[6.1,7)"
-        </camel.osgi.import.additional>
-        <camel.osgi.private.pkg>org.apache.camel.component.salesforce.internal.*</camel.osgi.private.pkg>
         <salesforce.component.root>..</salesforce.component.root>
     </properties>
 
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
index 7d34351b4d2..794909c1945 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
@@ -209,23 +209,6 @@
                     </archive>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>none</phase>
-                    </execution>
-                    <execution>
-                        <id>versions</id>
-                        <phase>none</phase>
-                    </execution>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>none</phase>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-package-maven-plugin</artifactId>
diff --git a/components/camel-saxon/pom.xml b/components/camel-saxon/pom.xml
index 9236ff7f69d..dc5370ca3c4 100644
--- a/components/camel-saxon/pom.xml
+++ b/components/camel-saxon/pom.xml
@@ -32,9 +32,6 @@
     <description>Camel Saxon (XQuery/XPath) support</description>
 
     <properties>
-        <camel.osgi.import.additional>
-            net.sf.saxon.*;version="[11,12)"
-        </camel.osgi.import.additional>
 
         <camel.surefire.parallel>true</camel.surefire.parallel>
     </properties>
diff --git a/components/camel-servicenow/camel-servicenow-component/pom.xml b/components/camel-servicenow/camel-servicenow-component/pom.xml
index 7d7680a0083..c2ff0c68dca 100644
--- a/components/camel-servicenow/camel-servicenow-component/pom.xml
+++ b/components/camel-servicenow/camel-servicenow-component/pom.xml
@@ -33,9 +33,6 @@
     <description>Camel ServiceNow support</description>
 
     <properties>
-        <camel.osgi.import.additional>
-            org.apache.cxf.*;version="${cxf-version-range}"
-        </camel.osgi.import.additional>
     </properties>
 
 
diff --git a/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml b/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml
index 693b9afdd88..c5031f39aec 100644
--- a/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml
+++ b/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml
@@ -178,23 +178,6 @@
                     </archive>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>none</phase>
-                    </execution>
-                    <execution>
-                        <id>versions</id>
-                        <phase>none</phase>
-                    </execution>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>none</phase>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-package-maven-plugin</artifactId>
diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml
index 0ff68248e5c..407213ce0ce 100644
--- a/components/camel-servlet/pom.xml
+++ b/components/camel-servlet/pom.xml
@@ -33,10 +33,6 @@
     <description>Camel servlet transport support</description>
 
     <properties>
-        <camel.osgi.import.before.defaults>
-            javax.activation.*;version="${javax-activation-version-range}",
-            javax.servlet.*;version="${servlet-version-range}"
-        </camel.osgi.import.before.defaults>
     </properties>
 
     <dependencies>
diff --git a/components/camel-sjms/pom.xml b/components/camel-sjms/pom.xml
index 90e1668c9aa..886e772212f 100644
--- a/components/camel-sjms/pom.xml
+++ b/components/camel-sjms/pom.xml
@@ -32,10 +32,6 @@
     <description>A pure Java JMS Camel Component</description>
 
     <properties>
-        <camel.osgi.import>
-            javax.jms;version="[1.1,3)",
-            *
-        </camel.osgi.import>
     </properties>
 
     <dependencies>
diff --git a/components/camel-sjms2/pom.xml b/components/camel-sjms2/pom.xml
index bd2e37181e9..68eade8464d 100644
--- a/components/camel-sjms2/pom.xml
+++ b/components/camel-sjms2/pom.xml
@@ -33,7 +33,6 @@
     <description>A pure Java JMS 2.0 Camel Component</description>
 
     <properties>
-        <camel.osgi.import.additional>javax.jms;version="[2,3)"</camel.osgi.import.additional>
     </properties>
 
     <dependencies>
diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index b39eceaa6c0..51e25275b50 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -32,11 +32,6 @@
     <description>Camel SOAP support</description>
 
     <properties>
-        <camel.osgi.import.before.defaults>
-            javax.xml.bind*;version="[2.2,3.0)",
-            javax.xml.ws*;version="[0.0,3)",
-            javax.xml.soap*;version="[1.3,2)"
-        </camel.osgi.import.before.defaults>
     </properties>
 
     <dependencies>
diff --git a/components/camel-solr/pom.xml b/components/camel-solr/pom.xml
index d0aa6745bb5..956812049d0 100644
--- a/components/camel-solr/pom.xml
+++ b/components/camel-solr/pom.xml
@@ -32,12 +32,6 @@
 
     <properties>
         <java.awt.headless>true</java.awt.headless>
-        <camel.osgi.import.before.defaults>
-            javax.activation.*;version="${javax-activation-version-range}"
-        </camel.osgi.import.before.defaults>
-        <camel.osgi.import.additional>
-            org.apache.solr.*;version="${solr-version-range}"
-        </camel.osgi.import.additional>
     </properties>
 
     <dependencies>
diff --git a/components/camel-splunk/pom.xml b/components/camel-splunk/pom.xml
index 403698506ed..a28902529eb 100644
--- a/components/camel-splunk/pom.xml
+++ b/components/camel-splunk/pom.xml
@@ -32,9 +32,6 @@
     <packaging>jar</packaging>
 
     <properties>
-        <camel.osgi.import.before.defaults>
-            org.joda.time.*;version="[1.6,3)"
-        </camel.osgi.import.before.defaults>
     </properties>
 
     <dependencies>
diff --git a/components/camel-spring-batch/pom.xml b/components/camel-spring-batch/pom.xml
index 1c2393e8d71..a70aecaa317 100644
--- a/components/camel-spring-batch/pom.xml
+++ b/components/camel-spring-batch/pom.xml
@@ -31,8 +31,6 @@
     <description>Camel Spring Batch support</description>
 
     <properties>
-        <camel.osgi.import.before.defaults>org.springframework.batch.*;version="[4,6)"
-        </camel.osgi.import.before.defaults>
     </properties>
 
     <dependencies>
diff --git a/components/camel-spring-integration/pom.xml b/components/camel-spring-integration/pom.xml
index 0e643bed072..46116561d1a 100644
--- a/components/camel-spring-integration/pom.xml
+++ b/components/camel-spring-integration/pom.xml
@@ -32,10 +32,6 @@
     <packaging>jar</packaging>
 
     <properties>
-        <camel.osgi.import.before.defaults>
-            org.springframework.integration.*;version="[5,6)",
-            org.springframework.messaging.*;version="[5,6)"
-        </camel.osgi.import.before.defaults>
     </properties>
 
     <dependencies>
diff --git a/components/camel-spring-ldap/pom.xml b/components/camel-spring-ldap/pom.xml
index 2fb9acedf7f..6b22df3bd0b 100644
--- a/components/camel-spring-ldap/pom.xml
+++ b/components/camel-spring-ldap/pom.xml
@@ -31,10 +31,6 @@
     <description>Camel support for Spring LDAP</description>
 
     <properties>
-        <camel.osgi.import.before.defaults>
-            org.springframework.ldap.*;version="[2,3)",
-            org.springframework.transaction.compensating.*;version="[2,3)"
-        </camel.osgi.import.before.defaults>
     </properties>
 
     <dependencies>
diff --git a/components/camel-spring-security/pom.xml b/components/camel-spring-security/pom.xml
index e103aa7eb34..777b996af05 100644
--- a/components/camel-spring-security/pom.xml
+++ b/components/camel-spring-security/pom.xml
@@ -34,8 +34,6 @@
         <firstVersion>2.3.0</firstVersion>
         <label>security,spring</label>
 
-        <camel.osgi.import.before.defaults>org.springframework.security.*;version="[4,5)"
-        </camel.osgi.import.before.defaults>
     </properties>
 
     <dependencies>
diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml
index 3deb3c61c35..9912b5e7cbd 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -33,14 +33,6 @@
     <description>Camel support for Spring Web Services</description>
 
     <properties>
-        <camel.osgi.import.before.defaults>
-            org.springframework.beans.*;version="${spring-version-range}",
-            org.springframework.util.*;version="${spring-version-range}",
-            org.springframework.ws.*;version="[3,4)",
-            org.springframework.xml.*;version="[3,4)",
-            javax.activation.*;version="${javax-activation-version-range}",
-            javax.xml.soap*;version="[1.3,2)"
-        </camel.osgi.import.before.defaults>
         <!-- for some weird reason org.springframework.ws and org.springframework.xml
               will have import-ranges of [2,3) by the bundle plugin, so we
               need to override it here -->
diff --git a/components/camel-spring-xml/pom.xml b/components/camel-spring-xml/pom.xml
index d1e13c3ac0f..e36b8a15410 100644
--- a/components/camel-spring-xml/pom.xml
+++ b/components/camel-spring-xml/pom.xml
@@ -37,10 +37,6 @@
         <label>spring</label>
         <supportLevel>Stable</supportLevel>
         <title>Spring XML</title>
-        <camel.osgi.import>
-            javax.xml.bind*;version="[2.2,3.0)",
-            *
-        </camel.osgi.import>
 
         <camel.surefire.forkCount>4</camel.surefire.forkCount>
         <camel.surefire.parallel>false</camel.surefire.parallel>
@@ -291,16 +287,6 @@
             </plugin>
 
             <!-- Push the execution order of the maven-bundle-plugin further to the end. That's why we add it here again. -->
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>prepare-package</phase>
-                    </execution>
-                </executions>
-            </plugin>
 
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
diff --git a/components/camel-stax/pom.xml b/components/camel-stax/pom.xml
index d948526e54d..8192c2f3b1d 100644
--- a/components/camel-stax/pom.xml
+++ b/components/camel-stax/pom.xml
@@ -32,10 +32,6 @@
     <description>Camel StAX support</description>
 
     <properties>
-        <camel.osgi.import>
-            javax.xml.bind*;version="[2.2,3.0)",
-            *
-        </camel.osgi.import>
     </properties>
 
     <dependencies>
diff --git a/components/camel-swagger-java/pom.xml b/components/camel-swagger-java/pom.xml
index 505f5dab6d5..fac7c89ee93 100644
--- a/components/camel-swagger-java/pom.xml
+++ b/components/camel-swagger-java/pom.xml
@@ -36,9 +36,6 @@
         <firstVersion>2.16.0</firstVersion>
         <label>rest,api</label>
 
-        <camel.osgi.import.before.defaults>
-            com.fasterxml.jackson.*;version="[2.13,3)"
-        </camel.osgi.import.before.defaults>
         <camel.surefire.parallel>true</camel.surefire.parallel>
     </properties>
 
diff --git a/components/camel-syslog/pom.xml b/components/camel-syslog/pom.xml
index 109c3dd5c05..df410db305d 100644
--- a/components/camel-syslog/pom.xml
+++ b/components/camel-syslog/pom.xml
@@ -31,10 +31,6 @@
     <description>Camel Syslog support</description>
 
     <properties>
-        <camel.osgi.import>
-            javax.xml.bind*;version="[2.2,3.0)",
-            *
-        </camel.osgi.import>
     </properties>
 
     <dependencies>
diff --git a/components/camel-twilio/pom.xml b/components/camel-twilio/pom.xml
index d9b59ba03c7..326d4f547eb 100644
--- a/components/camel-twilio/pom.xml
+++ b/components/camel-twilio/pom.xml
@@ -38,7 +38,6 @@
         <componentPackage>org.apache.camel.component.twilio</componentPackage>
         <outPackage>org.apache.camel.component.twilio.internal</outPackage>
 
-        <camel.osgi.private.pkg>${outPackage}</camel.osgi.private.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-undertow/pom.xml b/components/camel-undertow/pom.xml
index bde8cbf85fa..10044c25c15 100644
--- a/components/camel-undertow/pom.xml
+++ b/components/camel-undertow/pom.xml
@@ -32,9 +32,6 @@
     <name>Camel :: Undertow</name>
 
     <properties>
-        <camel.osgi.import.before.defaults>
-            javax.activation.*;version="${javax-activation-version-range}"
-        </camel.osgi.import.before.defaults>
     </properties>
 
     <dependencies>
diff --git a/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-maven-plugin/pom.xml b/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-maven-plugin/pom.xml
index b1b9c541b3e..f3217d3db5a 100644
--- a/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-maven-plugin/pom.xml
+++ b/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-maven-plugin/pom.xml
@@ -91,23 +91,6 @@
                     </archive>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>none</phase>
-                    </execution>
-                    <execution>
-                        <id>versions</id>
-                        <phase>none</phase>
-                    </execution>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>none</phase>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-package-maven-plugin</artifactId>
diff --git a/components/camel-websocket-jsr356/pom.xml b/components/camel-websocket-jsr356/pom.xml
index 6b5186bdc5b..dbd4f58fd59 100644
--- a/components/camel-websocket-jsr356/pom.xml
+++ b/components/camel-websocket-jsr356/pom.xml
@@ -32,12 +32,6 @@
     <properties>
         <tomcat.version>9.0.35</tomcat.version>
 
-        <camel.osgi.import.pkg>
-            !org.apache.camel.component.websocket.jsr356.*,
-            javax.websocket.*;version="[1.1,2)";resolution:=optional,
-            ${camel.osgi.import.defaults},
-            *
-        </camel.osgi.import.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-websocket/pom.xml b/components/camel-websocket/pom.xml
index 2bf99addc1e..fdbb936b88c 100644
--- a/components/camel-websocket/pom.xml
+++ b/components/camel-websocket/pom.xml
@@ -33,13 +33,6 @@
     <description>Camel WebSocket using Jetty</description>
 
     <properties>
-        <camel.osgi.import.pkg>
-            !org.apache.camel.component.websocket.*,
-            org.eclipse.jetty.util.ssl;version="[9.3,10)";resolution:=optional,
-            org.eclipse.jetty.*;version="[9.3,10)",
-            ${camel.osgi.import.defaults},
-            *
-        </camel.osgi.import.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-wordpress/pom.xml b/components/camel-wordpress/pom.xml
index e6e6802ce03..99f11dc93e0 100644
--- a/components/camel-wordpress/pom.xml
+++ b/components/camel-wordpress/pom.xml
@@ -34,9 +34,6 @@
     <description>Wordpress REST API support</description>
 
     <properties>
-        <camel.osgi.import.additional>
-            org.apache.cxf.*;version="${cxf-version-range}"
-        </camel.osgi.import.additional>
     </properties>
 
     <dependencies>
diff --git a/components/camel-xslt-saxon/pom.xml b/components/camel-xslt-saxon/pom.xml
index f6be6502450..e856babe082 100644
--- a/components/camel-xslt-saxon/pom.xml
+++ b/components/camel-xslt-saxon/pom.xml
@@ -33,9 +33,6 @@
     <description>Camel XSLT Saxon component</description>
 
     <properties>
-        <camel.osgi.import.additional>
-            net.sf.saxon.*;version="[11.0,12)"
-        </camel.osgi.import.additional>
     </properties>
 
     <dependencies>
diff --git a/components/camel-xstream/pom.xml b/components/camel-xstream/pom.xml
index 5009b82147e..0e461989cbc 100644
--- a/components/camel-xstream/pom.xml
+++ b/components/camel-xstream/pom.xml
@@ -33,9 +33,6 @@
     <description>Camel XStream support</description>
 
     <properties>
-        <camel.osgi.import.additional>
-            com.thoughtworks.xstream.*;version="[1.4.7,2)",
-        </camel.osgi.import.additional>
     </properties>
 
     <dependencies>
diff --git a/components/camel-zookeeper-master/pom.xml b/components/camel-zookeeper-master/pom.xml
index b5027800cf2..f2319b37347 100644
--- a/components/camel-zookeeper-master/pom.xml
+++ b/components/camel-zookeeper-master/pom.xml
@@ -33,11 +33,6 @@
     <description>Camel Zookeeper Master Support</description>
 
     <properties>
-        <camel.osgi.import>
-            !com.google.common.base;,
-            !org.apache.camel.component.zookeepermaster.group,
-            *
-        </camel.osgi.import>
     </properties>
 
     <dependencies>
diff --git a/components/pom.xml b/components/pom.xml
index 31395a84cab..f52a402107a 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -353,7 +353,6 @@
     </modules>
 
     <properties>
-        <camel.osgi.manifest>${project.build.outputDirectory}/META-INF/MANIFEST.MF</camel.osgi.manifest>
 
         <camel-prepare-component>true</camel-prepare-component>
     </properties>
@@ -454,63 +453,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-                <version>${project.version}</version>
-                <extensions>false</extensions>
-                <configuration>
-                    <supportIncrementalBuild>true</supportIncrementalBuild>
-                    <noWarningProjectTypes>pom</noWarningProjectTypes>
-                    <excludeDependencies>${camel.osgi.exclude.dependencies}</excludeDependencies>
-                    <instructions>
-                        <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Bundle-SymbolicName>${camel.osgi.symbolic.name}</Bundle-SymbolicName>
-                        <Bundle-Activator>${camel.osgi.activator}</Bundle-Activator>
-                        <Import-Package>${camel.osgi.import}</Import-Package>
-                        <Export-Package>${camel.osgi.export}</Export-Package>
-                        <!-- do not include any resources as not needed-->
-                        <Include-Resource></Include-Resource>
-                        <DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
-                        <Private-Package>${camel.osgi.private.pkg}</Private-Package>
-                        <Require-Capability>${camel.osgi.require.capability}</Require-Capability>
-                        <Provide-Capability>${camel.osgi.provide.capability}</Provide-Capability>
-                        <Implementation-Title>Apache Camel</Implementation-Title>
-                        <Implementation-Version>${project.version}</Implementation-Version>
-                        <Karaf-Info>Camel;${project.artifactId}=${project.version}</Karaf-Info>
-                        <_versionpolicy>${camel.osgi.import.default.version}</_versionpolicy>
-                        <_failok>${camel.osgi.failok}</_failok>
-                        <_removeheaders>Bnd-LastModified</_removeheaders>
-                        <_plugin>
-                            org.apache.felix.bundleplugin.BlueprintPlugin,
-                            aQute.lib.spring.SpringXMLType,
-                            org.apache.felix.bundleplugin.JpaPlugin,
-                            org.apache.camel.maven.bundle.CamelPlugin
-                        </_plugin>
-                    </instructions>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>versions</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>cleanVersions</goal>
-                        </goals>
-                        <configuration>
-                            <versions>
-                                <camel.osgi.version.clean>${project.version}</camel.osgi.version.clean>
-                            </versions>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
diff --git a/core/camel-api/pom.xml b/core/camel-api/pom.xml
index 95db786f98b..31757267d60 100644
--- a/core/camel-api/pom.xml
+++ b/core/camel-api/pom.xml
@@ -36,12 +36,6 @@
     <properties>
         <firstVersion>3.0.0</firstVersion>
         <label>core</label>
-        <camel.osgi.export.pkg>$${replace;{local-packages};;;\;},org.apache.camel.spi.annotations
-        </camel.osgi.export.pkg>
-        <camel.osgi.import>
-            javax.xml.bind*;version="[2.2,3.0)",
-            *
-        </camel.osgi.import>
     </properties>
 
     <dependencies>
diff --git a/core/camel-core-engine/pom.xml b/core/camel-core-engine/pom.xml
index 3d808ac4e11..97e6daec887 100644
--- a/core/camel-core-engine/pom.xml
+++ b/core/camel-core-engine/pom.xml
@@ -35,18 +35,6 @@
     <properties>
         <firstVersion>3.0.0</firstVersion>
         <label>core</label>
-        <camel.osgi.dynamic>
-            org.apache.camel.spring.util;${camel.osgi.import.strict.version},
-            org.apache.camel.spring.pollingconsumer;${camel.osgi.import.strict.version},
-            org.apache.camel.processor.interceptor.jpa;${camel.osgi.import.strict.version},
-            org.apache.camel.pollconsumer.quartz;${camel.osgi.import.strict.version},
-            org.apache.camel.component.caffeine;${camel.osgi.import.strict.version},
-            net.sf.saxon
-        </camel.osgi.dynamic>
-        <camel.osgi.import>
-            javax.xml.bind*;version="[2.2,3.0)",
-            *
-        </camel.osgi.import>
         <platform.skip.tests>false</platform.skip.tests>
     </properties>
 
@@ -144,20 +132,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <_plugin>
-                            org.apache.felix.bundleplugin.BlueprintPlugin,
-                            aQute.lib.spring.SpringXMLType,
-                            org.apache.felix.bundleplugin.JpaPlugin,
-                            org.apache.camel.maven.bundle.CamelPlugin
-                        </_plugin>
-                    </instructions>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/core/camel-core-model/pom.xml b/core/camel-core-model/pom.xml
index a4eee2b3500..f6ef335f98b 100644
--- a/core/camel-core-model/pom.xml
+++ b/core/camel-core-model/pom.xml
@@ -84,20 +84,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <_plugin>
-                            org.apache.felix.bundleplugin.BlueprintPlugin,
-                            aQute.lib.spring.SpringXMLType,
-                            org.apache.felix.bundleplugin.JpaPlugin,
-                            org.apache.camel.maven.bundle.CamelPlugin
-                        </_plugin>
-                    </instructions>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/core/camel-core-processor/pom.xml b/core/camel-core-processor/pom.xml
index 0d49e5907fe..b21d18f18a7 100644
--- a/core/camel-core-processor/pom.xml
+++ b/core/camel-core-processor/pom.xml
@@ -61,20 +61,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <_plugin>
-                            org.apache.felix.bundleplugin.BlueprintPlugin,
-                            aQute.lib.spring.SpringXMLType,
-                            org.apache.felix.bundleplugin.JpaPlugin,
-                            org.apache.camel.maven.bundle.CamelPlugin
-                        </_plugin>
-                    </instructions>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/core/camel-core-reifier/pom.xml b/core/camel-core-reifier/pom.xml
index c49564117ba..9f1cb866a30 100644
--- a/core/camel-core-reifier/pom.xml
+++ b/core/camel-core-reifier/pom.xml
@@ -76,20 +76,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <_plugin>
-                            org.apache.felix.bundleplugin.BlueprintPlugin,
-                            aQute.lib.spring.SpringXMLType,
-                            org.apache.felix.bundleplugin.JpaPlugin,
-                            org.apache.camel.maven.bundle.CamelPlugin
-                        </_plugin>
-                    </instructions>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/core/camel-core-xml/pom.xml b/core/camel-core-xml/pom.xml
index e78be88e30e..27273925cac 100644
--- a/core/camel-core-xml/pom.xml
+++ b/core/camel-core-xml/pom.xml
@@ -34,10 +34,6 @@
     <properties>
         <firstVersion>2.4.0</firstVersion>
         <label>dsl</label>
-        <camel.osgi.import>
-            javax.xml.bind*;version="[2.2,3.0)",
-            *
-        </camel.osgi.import>
     </properties>
 
     <dependencies>
diff --git a/core/camel-core/pom.xml b/core/camel-core/pom.xml
index 214e52ee8ba..b3e1c16fb6a 100644
--- a/core/camel-core/pom.xml
+++ b/core/camel-core/pom.xml
@@ -290,27 +290,6 @@
                     </environmentVariables>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <_plugin>
-                            org.apache.felix.bundleplugin.BlueprintPlugin,
-                            aQute.lib.spring.SpringXMLType,
-                            org.apache.felix.bundleplugin.JpaPlugin,
-                            org.apache.camel.maven.bundle.CamelPlugin
-                        </_plugin>
-                    </instructions>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.camel</groupId>
-                        <artifactId>camel-bundle-plugin</artifactId>
-                        <version>${project.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/core/camel-xml-jaxb/pom.xml b/core/camel-xml-jaxb/pom.xml
index 56298400482..6251af40cdb 100644
--- a/core/camel-xml-jaxb/pom.xml
+++ b/core/camel-xml-jaxb/pom.xml
@@ -34,19 +34,6 @@
     <properties>
         <firstVersion>3.1.0</firstVersion>
         <label>dsl</label>
-        <camel.osgi.import>
-            org.apache.camel.model;${camel.osgi.import.camel.version},
-            org.apache.camel.model.cloud;${camel.osgi.import.camel.version},
-            org.apache.camel.model.config;${camel.osgi.import.camel.version},
-            org.apache.camel.model.dataformat;${camel.osgi.import.camel.version},
-            org.apache.camel.model.language;${camel.osgi.import.camel.version},
-            org.apache.camel.model.loadbalancer;${camel.osgi.import.camel.version},
-            org.apache.camel.model.rest;${camel.osgi.import.camel.version},
-            org.apache.camel.model.transformer;${camel.osgi.import.camel.version},
-            org.apache.camel.model.validator;${camel.osgi.import.camel.version},
-            javax.xml.bind.*;version="[2.2,3.0)",
-            *
-        </camel.osgi.import>
     </properties>
 
     <dependencies>
diff --git a/core/pom.xml b/core/pom.xml
index 103b4c7b8f0..1e42308cf30 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -62,7 +62,6 @@
     </modules>
 
     <properties>
-        <camel.osgi.manifest>${project.build.outputDirectory}/META-INF/MANIFEST.MF</camel.osgi.manifest>
         <camel.surefire.parallel>true</camel.surefire.parallel>
     </properties>
 
@@ -139,56 +138,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-                <version>${project.version}</version>
-                <configuration>
-                    <supportIncrementalBuild>true</supportIncrementalBuild>
-                    <noWarningProjectTypes>pom</noWarningProjectTypes>
-                    <excludeDependencies>${camel.osgi.exclude.dependencies}</excludeDependencies>
-                    <instructions>
-                        <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Bundle-SymbolicName>${camel.osgi.symbolic.name}</Bundle-SymbolicName>
-                        <Bundle-Activator>${camel.osgi.activator}</Bundle-Activator>
-                        <Import-Package>${camel.osgi.import}</Import-Package>
-                        <Export-Package>${camel.osgi.export}</Export-Package>
-                        <!-- do not include any resources as not needed-->
-                        <Include-Resource></Include-Resource>
-                        <DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
-                        <Private-Package>${camel.osgi.private.pkg}</Private-Package>
-                        <Require-Capability>${camel.osgi.require.capability}</Require-Capability>
-                        <Provide-Capability>${camel.osgi.provide.capability}</Provide-Capability>
-                        <Implementation-Title>Apache Camel</Implementation-Title>
-                        <Implementation-Version>${project.version}</Implementation-Version>
-                        <Karaf-Info>Camel;${project.artifactId}=${project.version}</Karaf-Info>
-                        <_versionpolicy>${camel.osgi.import.default.version}</_versionpolicy>
-                        <_failok>${camel.osgi.failok}</_failok>
-                        <_removeheaders>Bnd-LastModified</_removeheaders>
-                    </instructions>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>versions</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>cleanVersions</goal>
-                        </goals>
-                        <configuration>
-                            <versions>
-                                <camel.osgi.version.clean>${project.version}</camel.osgi.version.clean>
-                            </versions>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/dsl/camel-endpointdsl/pom.xml b/dsl/camel-endpointdsl/pom.xml
index efaa11cf742..a2688330885 100644
--- a/dsl/camel-endpointdsl/pom.xml
+++ b/dsl/camel-endpointdsl/pom.xml
@@ -36,10 +36,6 @@
         <firstVersion>3.0.0</firstVersion>
         <title>Java Endpoint DSL</title>
         <label>dsl</label>
-        <camel.osgi.import>
-            javax.xml.bind*;version="[2.2,3.0)",
-            *
-        </camel.osgi.import>
     </properties>
 
     <dependencies>
diff --git a/dsl/pom.xml b/dsl/pom.xml
index 50890322abf..5a0bc2153b7 100644
--- a/dsl/pom.xml
+++ b/dsl/pom.xml
@@ -34,7 +34,6 @@
     <description>Camel DSL Parent</description>
 
     <properties>
-        <camel.osgi.manifest>${project.build.outputDirectory}/META-INF/MANIFEST.MF</camel.osgi.manifest>
         <camel.surefire.parallel>true</camel.surefire.parallel>
         <camel-prepare-component>true</camel-prepare-component>
     </properties>
@@ -134,54 +133,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-                <version>${project.version}</version>
-                <configuration>
-                    <supportIncrementalBuild>true</supportIncrementalBuild>
-                    <noWarningProjectTypes>pom</noWarningProjectTypes>
-                    <excludeDependencies>${camel.osgi.exclude.dependencies}</excludeDependencies>
-                    <instructions>
-                        <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Bundle-SymbolicName>${camel.osgi.symbolic.name}</Bundle-SymbolicName>
-                        <Bundle-Activator>${camel.osgi.activator}</Bundle-Activator>
-                        <Import-Package>${camel.osgi.import}</Import-Package>
-                        <Export-Package>${camel.osgi.export}</Export-Package>
-                        <DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
-                        <Private-Package>${camel.osgi.private.pkg}</Private-Package>
-                        <Require-Capability>${camel.osgi.require.capability}</Require-Capability>
-                        <Provide-Capability>${camel.osgi.provide.capability}</Provide-Capability>
-                        <Implementation-Title>Apache Camel</Implementation-Title>
-                        <Implementation-Version>${project.version}</Implementation-Version>
-                        <Karaf-Info>Camel;${project.artifactId}=${project.version}</Karaf-Info>
-                        <_versionpolicy>${camel.osgi.import.default.version}</_versionpolicy>
-                        <_failok>${camel.osgi.failok}</_failok>
-                        <_removeheaders>Bnd-LastModified</_removeheaders>
-                    </instructions>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>versions</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>cleanVersions</goal>
-                        </goals>
-                        <configuration>
-                            <versions>
-                                <camel.osgi.version.clean>${project.version}</camel.osgi.version.clean>
-                            </versions>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/init/camel-bundle-plugin/pom.xml b/init/camel-bundle-plugin/pom.xml
deleted file mode 100644
index ccc9f0261a1..00000000000
--- a/init/camel-bundle-plugin/pom.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>init</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-
-    <artifactId>camel-bundle-plugin</artifactId>
-    <packaging>maven-plugin</packaging>
-
-    <name>Camel :: Maven Plugins :: Enhanced Bundle Plugin</name>
-    <description>OSGi Bundle plugin detecting stale input</description>
-
-    <properties>
-        <sourcecheckExcludesComma>
-            **/*.java,
-        </sourcecheckExcludesComma>
-        <maven-version>3.3.9</maven-version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>maven-bundle-plugin</artifactId>
-            <version>${maven-bundle-plugin-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-core</artifactId>
-            <version>${maven-version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-compat</artifactId>
-            <version>${maven-version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-model</artifactId>
-            <version>${maven-version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-artifact</artifactId>
-            <version>${maven-version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.plugin-tools</groupId>
-            <artifactId>maven-plugin-annotations</artifactId>
-            <version>3.4</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/init/camel-bundle-plugin/src/main/java/org/apache/camel/maven/bundle/CamelPlugin.java b/init/camel-bundle-plugin/src/main/java/org/apache/camel/maven/bundle/CamelPlugin.java
deleted file mode 100644
index 38ca8f54134..00000000000
--- a/init/camel-bundle-plugin/src/main/java/org/apache/camel/maven/bundle/CamelPlugin.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.maven.bundle;
-
-import java.util.Collections;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import aQute.bnd.annotation.plugin.BndPlugin;
-import aQute.bnd.osgi.Analyzer;
-import aQute.bnd.osgi.Jar;
-import aQute.bnd.osgi.Resource;
-import aQute.bnd.service.AnalyzerPlugin;
-
-@BndPlugin(name = "camel")
-public class CamelPlugin implements AnalyzerPlugin {
-
-    @Override
-    public boolean analyzeJar(Analyzer analyzer) {
-        Jar jar = analyzer.getJar();
-        Map<String, Map<String, Resource>> dir = jar.getDirectories();
-
-        Stream<String> components = dir
-                .getOrDefault("META-INF/services/org/apache/camel/component", Collections.emptyMap()).keySet().stream()
-                .map(s -> s.substring(s.lastIndexOf('/') + 1))
-                .map(s -> "osgi.service;effective:=active;objectClass=\"org.apache.camel.spi.ComponentResolver\";component="
-                        + s);
-        Stream<String> languages = dir
-                .getOrDefault("META-INF/services/org/apache/camel/language", Collections.emptyMap()).keySet().stream()
-                .map(s -> s.substring(s.lastIndexOf('/') + 1))
-                .map(s -> "osgi.service;effective:=active;objectClass=\"org.apache.camel.spi.LanguageResolver\";language="
-                        + s);
-        Stream<String> dataformats = dir
-                .getOrDefault("META-INF/services/org/apache/camel/dataformat", Collections.emptyMap()).keySet().stream()
-                .map(s -> s.substring(s.lastIndexOf('/') + 1))
-                .map(s -> "osgi.service;effective:=active;objectClass=\"org.apache.camel.spi.DataformatResolver\";dataformat="
-                        + s);
-        String header = analyzer.getProperty("Provide-Capability");
-
-        header = Stream
-                .concat(header != null && !header.isEmpty() ? Stream.of(header) : Stream.empty(),
-                        Stream.concat(components, Stream.concat(languages, dataformats)))
-                .collect(Collectors.joining(","));
-
-        analyzer.setProperty("Provide-Capability", header);
-
-        return false;
-    }
-
-}
diff --git a/init/camel-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java b/init/camel-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
deleted file mode 100644
index 32308ce7370..00000000000
--- a/init/camel-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
+++ /dev/null
@@ -1,506 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.felix.bundleplugin;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOError;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.Set;
-import java.util.jar.Manifest;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import java.util.zip.ZipFile;
-
-import aQute.bnd.osgi.Analyzer;
-import aQute.bnd.osgi.Builder;
-import aQute.bnd.osgi.Instructions;
-import aQute.bnd.osgi.Jar;
-import aQute.bnd.osgi.Resource;
-import aQute.lib.collections.ExtList;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.plugins.annotations.ResolutionScope;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.Scanner;
-import org.osgi.service.metatype.MetaTypeService;
-import org.sonatype.plexus.build.incremental.BuildContext;
-
-/**
- * Generate an OSGi manifest for this project
- */
-@Mojo(name = "manifest", requiresDependencyResolution = ResolutionScope.TEST, threadSafe = true, defaultPhase = LifecyclePhase.PROCESS_CLASSES)
-public class ManifestPlugin extends BundlePlugin {
-    /**
-     * When true, generate the manifest by rebuilding the full bundle in memory
-     */
-    @Parameter(property = "rebuildBundle")
-    protected boolean rebuildBundle;
-
-    /**
-     * When true, manifest generation on incremental builds is supported in IDEs like Eclipse. Please note that the
-     * underlying BND library does not support incremental build, which means always the whole manifest and SCR metadata
-     * is generated.
-     */
-    @Parameter(property = "supportIncrementalBuild")
-    private boolean supportIncrementalBuild;
-
-    @Component
-    private BuildContext buildContext;
-
-    @Parameter(defaultValue = "${showStaleFiles}")
-    private boolean showStaleFiles;
-
-    @Override
-    protected void execute(Map<String, String> instructions, ClassPathItem[] classpath) throws MojoExecutionException {
-
-        if (supportIncrementalBuild && isUpToDate(project)) {
-            return;
-        }
-        // in incremental build execute manifest generation only when explicitly
-        // activated
-        // and when any java file was touched since last build
-        if (buildContext.isIncremental() && !(supportIncrementalBuild && anyJavaSourceFileTouchedSinceLastBuild())) {
-            getLog().debug(
-                    "Skipping manifest generation because no java source file was added, updated or removed since last build.");
-            return;
-        }
-
-        // avoid noisy logging
-        PatchedLog plog = new PatchedLog(getLog());
-        setLog(plog);
-
-        Analyzer analyzer;
-        try {
-            analyzer = getAnalyzer(project, instructions, classpath);
-        } catch (FileNotFoundException e) {
-            throw new MojoExecutionException(
-                    "Cannot find " + e.getMessage() + " (manifest goal must be run after compile phase)", e);
-        } catch (IOException e) {
-            throw new MojoExecutionException("Error trying to generate Manifest", e);
-        } catch (MojoFailureException e) {
-            getLog().error(e.getLocalizedMessage());
-            throw new MojoExecutionException("Error(s) found in manifest configuration", e);
-        } catch (Exception e) {
-            getLog().error("An internal error occurred", e);
-            throw new MojoExecutionException("Internal error in maven-bundle-plugin", e);
-        }
-
-        File outputFile = new File(manifestLocation, "MANIFEST.MF");
-
-        try {
-            writeManifest(analyzer, outputFile, niceManifest, exportScr, scrLocation, buildContext, getLog());
-
-            if (supportIncrementalBuild) {
-                writeIncrementalInfo(project);
-            }
-        } catch (Exception e) {
-            throw new MojoExecutionException("Error trying to write Manifest to file " + outputFile, e);
-        } finally {
-            try {
-                analyzer.close();
-            } catch (IOException e) {
-                throw new MojoExecutionException("Error trying to write Manifest to file " + outputFile, e);
-            }
-        }
-    }
-
-    /**
-     * Checks if any *.java file was added, updated or removed since last build in any source directory.
-     */
-    private boolean anyJavaSourceFileTouchedSinceLastBuild() {
-        @SuppressWarnings("unchecked")
-        List<String> sourceDirectories = project.getCompileSourceRoots();
-        for (String sourceDirectory : sourceDirectories) {
-            File directory = new File(sourceDirectory);
-            Scanner scanner = buildContext.newScanner(directory);
-            Scanner deleteScanner = buildContext.newDeleteScanner(directory);
-            if (containsJavaFile(scanner) || containsJavaFile(deleteScanner)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean containsJavaFile(Scanner scanner) {
-        String[] includes = new String[] { "**/*.java" };
-        scanner.setIncludes(includes);
-        scanner.scan();
-        return scanner.getIncludedFiles().length > 0;
-    }
-
-
-    private static void exportScr(Analyzer analyzer, Jar jar, File scrLocation, BuildContext buildContext, Log log)
-            throws Exception {
-        log.debug("Export SCR metadata to: " + scrLocation.getPath());
-        scrLocation.mkdirs();
-
-        // export SCR metadata files from OSGI-INF/
-        Map<String, Resource> scrDir = jar.getDirectories().get("OSGI-INF");
-        if (scrDir != null) {
-            for (Map.Entry<String, Resource> entry : scrDir.entrySet()) {
-                String path = entry.getKey();
-                Resource resource = entry.getValue();
-                writeSCR(resource, new File(scrLocation, path), buildContext, log);
-            }
-        }
-
-        // export metatype files from OSGI-INF/metatype
-        Map<String, Resource> metatypeDir = jar.getDirectories().get(MetaTypeService.METATYPE_DOCUMENTS_LOCATION);
-        if (metatypeDir != null) {
-            for (Map.Entry<String, Resource> entry : metatypeDir.entrySet()) {
-                String path = entry.getKey();
-                Resource resource = entry.getValue();
-                writeSCR(resource, new File(scrLocation, path), buildContext, log);
-            }
-        }
-
-    }
-
-    private static void writeSCR(Resource resource, File destination, BuildContext buildContext, Log log)
-            throws Exception {
-        log.debug("Write SCR file: " + destination.getPath());
-        destination.getParentFile().mkdirs();
-        OutputStream os = buildContext.newFileOutputStream(destination);
-        try {
-            resource.write(os);
-        } finally {
-            os.close();
-        }
-    }
-
-    protected Analyzer getAnalyzer(MavenProject project, Map<String, String> instructions, ClassPathItem[] classpath)
-            throws Exception {
-        if (rebuildBundle && supportedProjectTypes.contains(project.getArtifact().getType())) {
-            return buildOSGiBundle(project, instructions, classpath);
-        }
-
-        File file = getOutputDirectory();
-        if (file == null) {
-            file = project.getArtifact().getFile();
-        }
-
-        if (!file.exists()) {
-            if (file.equals(getOutputDirectory())) {
-                file.mkdirs();
-            } else {
-                throw new FileNotFoundException(file.getPath());
-            }
-        }
-
-        Builder analyzer = getOSGiBuilder(project, instructions, classpath);
-
-        analyzer.setJar(file);
-
-        // calculateExportsFromContents when we have no explicit instructions
-        // defining
-        // the contents of the bundle *and* we are not analyzing the output
-        // directory,
-        // otherwise fall-back to addMavenInstructions approach
-
-        boolean isOutputDirectory = file.equals(getOutputDirectory());
-
-        if (analyzer.getProperty(Analyzer.EXPORT_PACKAGE) == null
-                && analyzer.getProperty(Analyzer.EXPORT_CONTENTS) == null
-                && analyzer.getProperty(Analyzer.PRIVATE_PACKAGE) == null && !isOutputDirectory) {
-            String export = calculateExportsFromContents(analyzer.getJar());
-            analyzer.setProperty(Analyzer.EXPORT_PACKAGE, export);
-        }
-
-        addMavenInstructions(project, analyzer);
-
-        // if we spot Embed-Dependency and the bundle is "target/classes",
-        // assume we need to rebuild
-        if (analyzer.getProperty(DependencyEmbedder.EMBED_DEPENDENCY) != null && isOutputDirectory) {
-            analyzer.build();
-        } else {
-            analyzer.mergeManifest(analyzer.getJar().getManifest());
-            analyzer.getJar().setManifest(analyzer.calcManifest());
-        }
-
-        mergeMavenManifest(project, analyzer);
-
-        boolean hasErrors = reportErrors("Manifest " + project.getArtifact(), analyzer);
-        if (hasErrors) {
-            String failok = analyzer.getProperty("-failok");
-            if (null == failok || "false".equalsIgnoreCase(failok)) {
-                throw new MojoFailureException("Error(s) found in manifest configuration");
-            }
-        }
-
-        Jar jar = analyzer.getJar();
-
-        if (unpackBundle) {
-            File outputFile = getOutputDirectory();
-            for (Entry<String, Resource> entry : jar.getResources().entrySet()) {
-                File entryFile = new File(outputFile, entry.getKey());
-                if (!entryFile.exists() || entry.getValue().lastModified() == 0) {
-                    entryFile.getParentFile().mkdirs();
-                    OutputStream os = buildContext.newFileOutputStream(entryFile);
-                    entry.getValue().write(os);
-                    os.close();
-                }
-            }
-        }
-
-        return analyzer;
-    }
-
-    private void writeIncrementalInfo(MavenProject project) throws MojoExecutionException {
-        try {
-            Path cacheData = getIncrementalDataPath(project);
-            String curdata = getIncrementalData();
-            Files.createDirectories(cacheData.getParent());
-            try (Writer w = Files.newBufferedWriter(cacheData)) {
-                w.append(curdata);
-            }
-        } catch (IOException e) {
-            throw new MojoExecutionException("Error checking manifest uptodate status", e);
-        }
-    }
-
-    private boolean isUpToDate(MavenProject project) throws MojoExecutionException {
-        try {
-            Path cacheData = getIncrementalDataPath(project);
-            final String prvdata = getPreviousRunData(cacheData);
-            final String curdata = getIncrementalData();
-            if (curdata.equals(prvdata)) {
-                long lastmod = Files.getLastModifiedTime(cacheData).toMillis();
-                Set<String> stale = Stream
-                        .concat(Stream.of(new File(project.getBuild().getOutputDirectory())),
-                                project.getArtifacts().stream().map(Artifact::getFile))
-                        .flatMap(f -> newer(lastmod, f)).collect(Collectors.toSet());
-                if (!stale.isEmpty()) {
-                    getLog().info("Stale files detected, re-generating manifest.");
-                    if (showStaleFiles) {
-                        getLog().info("Stale files: " + stale.stream().collect(Collectors.joining(", ")));
-                    } else if (getLog().isDebugEnabled()) {
-                        getLog().debug("Stale files: " + stale.stream().collect(Collectors.joining(", ")));
-                    }
-                } else {
-                    // everything is in order, skip
-                    getLog().info("Skipping manifest generation, everything is up to date.");
-                    return true;
-                }
-            } else {
-                if (prvdata == null) {
-                    getLog().info("No previous run data found, generating manifest.");
-                } else {
-                    getLog().info("Configuration changed, re-generating manifest.");
-                }
-            }
-        } catch (IOException e) {
-            throw new MojoExecutionException("Error checking manifest uptodate status", e);
-        }
-        return false;
-    }
-
-    private String getPreviousRunData(Path cacheData) throws IOException {
-        String prvdata;
-        if (Files.isRegularFile(cacheData)) {
-            prvdata = new String(Files.readAllBytes(cacheData), StandardCharsets.UTF_8);
-        } else {
-            prvdata = null;
-        }
-        return prvdata;
-    }
-
-    private String getIncrementalData() {
-        return getInstructions().entrySet().stream().map(e -> e.getKey() + "=" + e.getValue())
-                .collect(Collectors.joining("\n", "", "\n"));
-    }
-
-    private Path getIncrementalDataPath(MavenProject project) {
-        return Paths.get(project.getBuild().getDirectory(), "maven-bundle-plugin",
-                "org.apache.felix_maven-bundle-plugin_manifest_xx");
-    }
-
-    private long lastmod(Path p) {
-        try {
-            return Files.getLastModifiedTime(p).toMillis();
-        } catch (IOException e) {
-            return 0;
-        }
-    }
-
-    private Stream<String> newer(long lastmod, File file) {
-        try {
-            if (file.isDirectory()) {
-                return Files.walk(file.toPath()).filter(Files::isRegularFile).filter(p -> lastmod(p) > lastmod)
-                        .map(Path::toString);
-            } else if (file.isFile()) {
-                if (lastmod(file.toPath()) > lastmod) {
-                    if (file.getName().endsWith(".jar")) {
-                        try (ZipFile zf = new ZipFile(file)) {
-                            return zf.stream().filter(ze -> !ze.isDirectory())
-                                    .filter(ze -> ze.getLastModifiedTime().toMillis() > lastmod)
-                                    .map(ze -> file + "!" + ze.getName()).collect(Collectors.toList())
-                                    .stream();
-                        }
-                    } else {
-                        return Stream.of(file.toString());
-                    }
-                } else {
-                    return Stream.empty();
-                }
-            } else {
-                return Stream.empty();
-            }
-        } catch (IOException e) {
-            throw new IOError(e);
-        }
-    }
-
-    public static void writeManifest(Analyzer analyzer, File outputFile, boolean niceManifest, boolean exportScr,
-            File scrLocation, BuildContext buildContext, Log log) throws Exception {
-        Properties properties = analyzer.getProperties();
-        Jar jar = analyzer.getJar();
-        Manifest manifest = jar.getManifest();
-        if (outputFile.exists() && properties.containsKey("Merge-Headers")) {
-            Manifest analyzerManifest = manifest;
-            manifest = new Manifest();
-
-            try(InputStream inputStream = new FileInputStream(outputFile)) {
-                manifest.read(inputStream);
-            }
-
-            Instructions instructions = new Instructions(ExtList.from(analyzer.getProperty("Merge-Headers")));
-            mergeManifest(instructions, manifest, analyzerManifest);
-        } else {
-            File parentFile = outputFile.getParentFile();
-            parentFile.mkdirs();
-        }
-        writeManifest(manifest, outputFile, niceManifest, buildContext, log);
-
-        if (exportScr) {
-            exportScr(analyzer, jar, scrLocation, buildContext, log);
-        }
-    }
-
-    public static void writeManifest(Manifest manifest, File outputFile, boolean niceManifest,
-            BuildContext buildContext, Log log) throws IOException {
-
-        try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
-            ManifestWriter.outputManifest(manifest, baos, niceManifest);
-
-            if (log.isDebugEnabled()) {
-                log.debug("Write manifest to " + outputFile.getPath());
-            }
-
-            if (updateFile(outputFile.toPath(), baos.toByteArray())) {
-                buildContext.refresh(outputFile);
-            }
-        }
-    }
-
-    /**
-     * Update a file with the given binary content if neeed. The file won't be modified if the content is already the
-     * same.
-     *
-     * @param path
-     *            the path of the file to update
-     * @param newdata
-     *            the new binary data, <code>null</code> to delete the file
-     * 
-     * @return <code>true</code> if the file was modified, <code>false</code> otherwise
-     * 
-     * @throws IOException
-     *             if an exception occurs
-     */
-    public static boolean updateFile(Path path, byte[] newdata) throws IOException {
-        if (newdata == null) {
-            if (!Files.exists(path)) {
-                return false;
-            }
-            Files.delete(path);
-            return true;
-        } else {
-            byte[] olddata = new byte[0];
-            if (Files.exists(path) && Files.isReadable(path)) {
-                olddata = Files.readAllBytes(path);
-            }
-            if (Arrays.equals(olddata, newdata)) {
-                return false;
-            }
-            Files.createDirectories(path.getParent());
-            Files.write(path, newdata, StandardOpenOption.WRITE, StandardOpenOption.CREATE,
-                    StandardOpenOption.TRUNCATE_EXISTING);
-            return true;
-        }
-    }
-
-    /*
-     * Patched version of bnd's Analyzer.calculateExportsFromContents
-     */
-    public static String calculateExportsFromContents(Jar bundle) {
-        String ddel = "";
-        StringBuffer sb = new StringBuffer();
-        Map<String, Map<String, Resource>> map = bundle.getDirectories();
-        for (Iterator<Entry<String, Map<String, Resource>>> i = map.entrySet().iterator(); i.hasNext();) {
-            // ----------------------------------------------------
-            // should also ignore directories with no resources
-            // ----------------------------------------------------
-            Entry<String, Map<String, Resource>> entry = i.next();
-            if (entry.getValue() == null || entry.getValue().isEmpty()) {
-                continue;
-            }
-            // ----------------------------------------------------
-            String directory = entry.getKey();
-            if (directory.equals("META-INF") || directory.startsWith("META-INF/")) {
-                continue;
-            }
-            if (directory.equals("OSGI-OPT") || directory.startsWith("OSGI-OPT/")) {
-                continue;
-            }
-            if (directory.equals("/")) {
-                continue;
-            }
-
-            if (directory.endsWith("/")) {
-                directory = directory.substring(0, directory.length() - 1);
-            }
-
-            directory = directory.replace('/', '.');
-            sb.append(ddel);
-            sb.append(directory);
-            ddel = ",";
-        }
-        return sb.toString();
-    }
-}
diff --git a/init/camel-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/PatchedLog.java b/init/camel-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/PatchedLog.java
deleted file mode 100644
index 86895b8c0f8..00000000000
--- a/init/camel-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/PatchedLog.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.felix.bundleplugin;
-
-import org.apache.maven.plugin.logging.Log;
-
-/**
- * Patched logger that is not noisy.
- */
-public class PatchedLog implements Log {
-
-    private final Log delegate;
-
-    public PatchedLog(Log delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public boolean isDebugEnabled() {
-        return delegate.isDebugEnabled();
-    }
-
-    @Override
-    public void debug(CharSequence charSequence) {
-        delegate.debug(charSequence);
-    }
-
-    @Override
-    public void debug(CharSequence charSequence, Throwable throwable) {
-        delegate.debug(charSequence, throwable);
-    }
-
-    @Override
-    public void debug(Throwable throwable) {
-        delegate.debug(throwable);
-    }
-
-    @Override
-    public boolean isInfoEnabled() {
-        return delegate.isInfoEnabled();
-    }
-
-    @Override
-    public void info(CharSequence charSequence) {
-        delegate.info(charSequence);
-    }
-
-    @Override
-    public void info(CharSequence charSequence, Throwable throwable) {
-        delegate.info(charSequence, throwable);
-    }
-
-    @Override
-    public void info(Throwable throwable) {
-        delegate.info(throwable);
-    }
-
-    @Override
-    public boolean isWarnEnabled() {
-        return delegate.isWarnEnabled();
-    }
-
-    @Override
-    public void warn(CharSequence charSequence) {
-        // skip some unwanted WARN logging
-        String s = charSequence.toString();
-        if (s.startsWith("Include-Resource: overriding")) {
-            return;
-        }
-        delegate.warn(charSequence);
-    }
-
-    @Override
-    public void warn(CharSequence charSequence, Throwable throwable) {
-        delegate.warn(charSequence, throwable);
-    }
-
-    @Override
-    public void warn(Throwable throwable) {
-        delegate.warn(throwable);
-    }
-
-    @Override
-    public boolean isErrorEnabled() {
-        return delegate.isErrorEnabled();
-    }
-
-    @Override
-    public void error(CharSequence charSequence) {
-        delegate.error(charSequence);
-    }
-
-    @Override
-    public void error(CharSequence charSequence, Throwable throwable) {
-        delegate.error(charSequence, throwable);
-    }
-
-    @Override
-    public void error(Throwable throwable) {
-        delegate.error(throwable);
-    }
-}
diff --git a/init/camel-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/VersionCleanerPlugin.java b/init/camel-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/VersionCleanerPlugin.java
deleted file mode 100644
index 733e567e243..00000000000
--- a/init/camel-bundle-plugin/src/main/java/org/apache/felix/bundleplugin/VersionCleanerPlugin.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.felix.bundleplugin;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.osgi.DefaultMaven2OsgiConverter;
-import org.apache.maven.shared.osgi.Maven2OsgiConverter;
-
-/**
- * Clean OSGi versions, ie convert a group of versions to OSGi format.
- */
-@Mojo(name = "cleanVersions", threadSafe = true)
-public class VersionCleanerPlugin extends AbstractMojo {
-
-    /**
-     * The BND instructions for the bundle.
-     */
-    @Parameter
-    private Map<String, String> versions = new LinkedHashMap<String, String>();
-
-    /**
-     * The Maven project.
-     */
-    @Parameter(defaultValue = "${project}", readonly = true, required = true)
-    private MavenProject project;
-
-    private Maven2OsgiConverter maven2OsgiConverter = new DefaultMaven2OsgiConverter();
-
-    public Maven2OsgiConverter getMaven2OsgiConverter() {
-        return maven2OsgiConverter;
-    }
-
-    public void setMaven2OsgiConverter(Maven2OsgiConverter maven2OsgiConverter) {
-        this.maven2OsgiConverter = maven2OsgiConverter;
-    }
-
-    public void execute() throws MojoExecutionException, MojoFailureException {
-        for (Map.Entry<String, String> entry : versions.entrySet()) {
-            String name = entry.getKey();
-            String version = entry.getValue();
-            String osgi = maven2OsgiConverter.getVersion(version);
-            project.getProperties().put(name, osgi);
-        }
-    }
-}
diff --git a/init/camel-bundle-plugin/src/main/resources/META-INF/LICENSE.txt b/init/camel-bundle-plugin/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b1270ff0..00000000000
--- a/init/camel-bundle-plugin/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/init/camel-bundle-plugin/src/main/resources/META-INF/MANIFEST.MF b/init/camel-bundle-plugin/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/init/camel-bundle-plugin/src/main/resources/META-INF/NOTICE.txt b/init/camel-bundle-plugin/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 0291ff5ba9e..00000000000
--- a/init/camel-bundle-plugin/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-   =========================================================================
-   ==  NOTICE file corresponding to the section 4 d of                    ==
-   ==  the Apache License, Version 2.0,                                   ==
-   ==  in this case for the Apache Camel distribution.                    ==
-   =========================================================================
-
-   This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
-
-   This product includes software developed by
-   Clifton Labs (https://github.com/cliftonlabs/json-simple).
-
-   Please read the different LICENSE files present in the licenses directory of
-   this distribution.
diff --git a/init/pom.xml b/init/pom.xml
deleted file mode 100644
index ca3e805457d..00000000000
--- a/init/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-
-    <artifactId>init</artifactId>
-    <packaging>pom</packaging>
-
-    <name>Camel :: Init</name>
-    <description>Camel Init</description>
-
-    <modules>
-        <module>camel-bundle-plugin</module>
-    </modules>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin-version}</version>
-                <configuration>
-                    <release>${jdk.version}</release>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>${maven-surefire-plugin-version}</version>
-                    <configuration>
-                        <failIfNoTests>false</failIfNoTests>
-                    </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/parent/pom.xml b/parent/pom.xml
index 0565a4895fb..36ac51301c3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -76,7 +76,6 @@
         <atlassian-fugue-version>3.0.0</atlassian-fugue-version>
         <atmos-client-version>3.2.1</atmos-client-version>
         <atmosphere-version>2.6.4</atmosphere-version>
-        <atmosphere-version-range>[2.6,3.0)</atmosphere-version-range>
         <avro-version>1.11.1</avro-version>
         <avro-ipc-jetty-version>1.11.1</avro-ipc-jetty-version>
         <avro-ipc-netty-version>1.11.1</avro-ipc-netty-version>
@@ -134,7 +133,6 @@
         <couchbase-client-version>3.3.4</couchbase-client-version>
         <curator-version>4.3.0</curator-version>
         <cxf-version>3.5.4</cxf-version>
-        <cxf-version-range>[3.5,3.6)</cxf-version-range>
         <cxf-codegen-plugin-version>3.5.4</cxf-codegen-plugin-version>
         <!-- cxf-xjc is not released as often -->
         <cxf-xjc-plugin-version>3.3.2</cxf-xjc-plugin-version>
@@ -272,7 +270,6 @@
         <javax-el3-version>3.0.0</javax-el3-version>
         <javax-el-api-hibernate-validator-version>3.0.1-b04</javax-el-api-hibernate-validator-version>
         <javax-el-hibernate-validator-version>3.0.1-b10</javax-el-hibernate-validator-version>
-        <javax-activation-version-range>[0,2)</javax-activation-version-range>
         <javax-activation-version>1.2.0</javax-activation-version>
         <javax-annotation-api-version>1.3.2</javax-annotation-api-version>
         <jakarta-mail-version>1.6.7</jakarta-mail-version>
@@ -296,7 +293,6 @@
         <jclouds-version>2.5.0</jclouds-version>
         <!-- jclouds must use this guava version -->
         <jclouds-google-guava-version>27.1-jre</jclouds-google-guava-version>
-        <jclouds-google-guava-version-range>[27.0,28.0)</jclouds-google-guava-version-range>
         <jcommander-version>1.72</jcommander-version>
         <jcr-version>2.0</jcr-version>
         <jedis-client-version>3.7.1</jedis-client-version>
@@ -362,7 +358,6 @@
         <log4j2-version>2.18.0</log4j2-version>
         <logback-version>1.2.11</logback-version>
         <lucene-version>8.11.1</lucene-version>
-        <lucene-version-range>[8,9)</lucene-version-range>
         <lightcouch-version>0.2.0</lightcouch-version>
         <mapstruct-version>1.5.2.Final</mapstruct-version>
         <!-- needed from tooling/archetypes -->
@@ -472,7 +467,6 @@
         <scala-version>2.11.12</scala-version>
         <scala-datasonnet-version>2.13.9</scala-datasonnet-version>
         <servicemix-specs-version>2.9.0</servicemix-specs-version>
-        <servlet-version-range>[3,4)</servlet-version-range>
         <shiro-version>1.9.1</shiro-version>
         <shrinkwrap-descriptors-version>2.0.0</shrinkwrap-descriptors-version>
         <!-- Maven version required by Shrinkwrap -->
@@ -492,7 +486,6 @@
         <snmp4j-version>2.6.3_1</snmp4j-version>
         <!-- solr version aligned with lucene -->
         <solr-version>8.11.2</solr-version>
-        <solr-version-range>[8,9)</solr-version-range>
         <solr-zookeeper-version>3.6.2</solr-zookeeper-version>
         <spark-version>3.2.2</spark-version>
         <splunk-version>1.9.0_1</splunk-version>
@@ -502,7 +495,6 @@
         <spring-integration-version>5.5.15</spring-integration-version>
         <spring-ldap-version>2.4.1</spring-ldap-version>
         <spring-vault-core-version>2.3.2</spring-vault-core-version>
-        <spring-version-range>[5,6)</spring-version-range>
         <spring-version>${spring5-version}</spring-version>
         <spring5-version>5.3.24</spring5-version>
         <spring-rabbitmq-version>2.4.7</spring-rabbitmq-version>
@@ -560,38 +552,6 @@
         <zookeeper-version>3.5.9</zookeeper-version>
         <zxing-version>3.5.0</zxing-version>
 
-        <!-- OSGi bundles properties -->
-        <camel.osgi.import.camel.version>
-            version="[$(version;==;${camel.osgi.version.clean}),$(version;=+;${camel.osgi.version.clean}))"
-        </camel.osgi.import.camel.version>
-        <camel.osgi.import.strict.version>
-            version="[$(version;===;${camel.osgi.version.clean}),$(version;==+;${camel.osgi.version.clean}))"
-        </camel.osgi.import.strict.version>
-        <camel.osgi.import.default.version>[$(version;==;$(@)),$(version;+;$(@)))</camel.osgi.import.default.version>
-        <camel.osgi.import.defaults>
-        </camel.osgi.import.defaults>
-        <camel.osgi.import.before.defaults />
-        <camel.osgi.import.additional />
-        <camel.osgi.import.pkg>
-            org.apache.camel.*;${camel.osgi.import.camel.version},
-            ${camel.osgi.import.before.defaults},
-            ${camel.osgi.import.defaults},
-            ${camel.osgi.import.additional},
-            *
-        </camel.osgi.import.pkg>
-        <camel.osgi.activator />
-        <camel.osgi.failok>false</camel.osgi.failok>
-        <camel.osgi.private.pkg>!*</camel.osgi.private.pkg>
-        <camel.osgi.export.pkg>$${replace;{local-packages};;;\;}</camel.osgi.export.pkg>
-        <camel.osgi.export>${camel.osgi.export.pkg};-noimport:=true;${camel.osgi.version}</camel.osgi.export>
-        <camel.osgi.version>version=${project.version}</camel.osgi.version>
-        <camel.osgi.import>${camel.osgi.import.pkg}</camel.osgi.import>
-        <camel.osgi.dynamic />
-        <camel.osgi.symbolic.name>${project.groupId}.${project.artifactId}</camel.osgi.symbolic.name>
-        <camel.osgi.exclude.dependencies>false</camel.osgi.exclude.dependencies>
-        <camel.osgi.require.capability />
-        <camel.osgi.provide.capability />
-        <camel.osgi.manifest>${project.build.outputDirectory}/META-INF/MANIFEST.MF</camel.osgi.manifest>
     </properties>
 
     <dependencyManagement>
diff --git a/pom.xml b/pom.xml
index 78b3629dce7..50ea06d1324 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,6 @@
 
     <modules>
         <module>parent</module>
-        <module>init</module>
         <module>etc</module>
         <module>bom</module>
         <module>buildingtools</module>
diff --git a/tests/pom.xml b/tests/pom.xml
index 64f65160359..916bc578407 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -34,7 +34,6 @@
     <packaging>pom</packaging>
 
     <properties>
-        <camel.osgi.export.pkg />
     </properties>
 
     <modules>
@@ -49,22 +48,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-                <version>${project.version}</version>
-                <configuration>
-                 </configuration>
-                <executions>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/tests/test-bundles/mock-javamail_1.7/pom.xml b/tests/test-bundles/mock-javamail_1.7/pom.xml
index 15dfc6c7c37..f7e85d8ad4c 100644
--- a/tests/test-bundles/mock-javamail_1.7/pom.xml
+++ b/tests/test-bundles/mock-javamail_1.7/pom.xml
@@ -39,19 +39,6 @@
         <pkgArtifactId>mock-javamail</pkgArtifactId>
         <pkgVersion>1.7</pkgVersion>
         <servicemix.legal.version>1.0</servicemix.legal.version>
-        <camel.osgi.export.pkg>
-            org.jvnet.mock_javamail*
-        </camel.osgi.export.pkg>
-        <camel.osgi.import.pkg>
-            *
-        </camel.osgi.import.pkg>
-        <camel.osgi.private.pkg>
-            META-INF;-split-package:=merge-first,
-            META-INF.services;-split-package:=merge-first
-            META-INF.maven.org.apache.camel.tests*;-split-package:=merge-first
-        </camel.osgi.private.pkg>
-        <camel.osgi.export>${camel.osgi.export.pkg}*;version=${pkgVersion};-split-package:=merge-first
-        </camel.osgi.export>
     </properties>
 
     <dependencies>
diff --git a/tests/test-bundles/pom.xml b/tests/test-bundles/pom.xml
index 349765e4616..373c2cbf80d 100644
--- a/tests/test-bundles/pom.xml
+++ b/tests/test-bundles/pom.xml
@@ -35,13 +35,6 @@
 
     <properties>
         <servicemix.legal.version>1.0</servicemix.legal.version>
-        <camel.osgi.export>${camel.osgi.export.pkg}*;version=${pkgVersion};-split-package:=merge-first
-        </camel.osgi.export>
-        <camel.osgi.export.pkg />
-        <camel.osgi.import.pkg />
-        <camel.osgi.private.pkg />
-        <camel.osgi.dynamicimport.pkg />
-        <camel.osgi.failok>false</camel.osgi.failok>
     </properties>
 
     <build>
@@ -86,31 +79,6 @@
         </pluginManagement>
 
         <plugins>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-                <version>${project.version}</version>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>${camel.osgi.export}</Export-Package>
-                        <Import-Package>${camel.osgi.import.pkg}*</Import-Package>
-                        <Private-Package>${camel.osgi.private.pkg}</Private-Package>
-                        <DynamicImport-Package>${camel.osgi.dynamicimport.pkg}</DynamicImport-Package>
-                        <_failok>${camel.osgi.failok}</_failok>
-                    </instructions>
-                    <unpackBundle>true</unpackBundle>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
diff --git a/tooling/camel-tooling-model/pom.xml b/tooling/camel-tooling-model/pom.xml
index 15f39facbf9..8d826cd27bf 100644
--- a/tooling/camel-tooling-model/pom.xml
+++ b/tooling/camel-tooling-model/pom.xml
@@ -32,12 +32,6 @@
     <description>Tooling Model</description>
 
     <properties>
-        <camel.osgi.import.pkg>
-            *
-        </camel.osgi.import.pkg>
-        <camel.osgi.export.pkg>
-            org.apache.camel.tooling.model
-        </camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
@@ -56,54 +50,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-                <version>${project.version}</version>
-                <configuration>
-                    <supportIncrementalBuild>true</supportIncrementalBuild>
-                    <noWarningProjectTypes>pom</noWarningProjectTypes>
-                    <excludeDependencies>${camel.osgi.exclude.dependencies}</excludeDependencies>
-                    <instructions>
-                        <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Bundle-SymbolicName>${camel.osgi.symbolic.name}</Bundle-SymbolicName>
-                        <Bundle-Activator>${camel.osgi.activator}</Bundle-Activator>
-                        <Import-Package>${camel.osgi.import}</Import-Package>
-                        <Export-Package>${camel.osgi.export}</Export-Package>
-                        <DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
-                        <Private-Package>${camel.osgi.private.pkg}</Private-Package>
-                        <Require-Capability>${camel.osgi.require.capability}</Require-Capability>
-                        <Provide-Capability>${camel.osgi.provide.capability}</Provide-Capability>
-                        <Implementation-Title>Apache Camel</Implementation-Title>
-                        <Implementation-Version>${project.version}</Implementation-Version>
-                        <Karaf-Info>Camel;${project.artifactId}=${project.version}</Karaf-Info>
-                        <_versionpolicy>${camel.osgi.import.default.version}</_versionpolicy>
-                        <_failok>${camel.osgi.failok}</_failok>
-                        <_removeheaders>Bnd-LastModified</_removeheaders>
-                    </instructions>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>versions</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>cleanVersions</goal>
-                        </goals>
-                        <configuration>
-                            <versions>
-                                <camel.osgi.version.clean>${project.version}</camel.osgi.version.clean>
-                            </versions>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/tooling/camel-tooling-util/pom.xml b/tooling/camel-tooling-util/pom.xml
index d73f4e7a65a..6e0082731e8 100644
--- a/tooling/camel-tooling-util/pom.xml
+++ b/tooling/camel-tooling-util/pom.xml
@@ -32,12 +32,6 @@
     <description>Tooling utilities</description>
 
     <properties>
-        <camel.osgi.import.pkg>
-            *
-        </camel.osgi.import.pkg>
-        <camel.osgi.export.pkg>
-            org.apache.camel.tooling.util
-        </camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
@@ -51,54 +45,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-                <version>${project.version}</version>
-                <configuration>
-                    <supportIncrementalBuild>true</supportIncrementalBuild>
-                    <noWarningProjectTypes>pom</noWarningProjectTypes>
-                    <excludeDependencies>${camel.osgi.exclude.dependencies}</excludeDependencies>
-                    <instructions>
-                        <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Bundle-SymbolicName>${camel.osgi.symbolic.name}</Bundle-SymbolicName>
-                        <Bundle-Activator>${camel.osgi.activator}</Bundle-Activator>
-                        <Import-Package>${camel.osgi.import}</Import-Package>
-                        <Export-Package>${camel.osgi.export}</Export-Package>
-                        <DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
-                        <Private-Package>${camel.osgi.private.pkg}</Private-Package>
-                        <Require-Capability>${camel.osgi.require.capability}</Require-Capability>
-                        <Provide-Capability>${camel.osgi.provide.capability}</Provide-Capability>
-                        <Implementation-Title>Apache Camel</Implementation-Title>
-                        <Implementation-Version>${project.version}</Implementation-Version>
-                        <Karaf-Info>Camel;${project.artifactId}=${project.version}</Karaf-Info>
-                        <_versionpolicy>${camel.osgi.import.default.version}</_versionpolicy>
-                        <_failok>${camel.osgi.failok}</_failok>
-                        <_removeheaders>Bnd-LastModified</_removeheaders>
-                    </instructions>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>versions</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>cleanVersions</goal>
-                        </goals>
-                        <configuration>
-                            <versions>
-                                <camel.osgi.version.clean>${project.version}</camel.osgi.version.clean>
-                            </versions>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/tooling/camel-util-json/pom.xml b/tooling/camel-util-json/pom.xml
index 01b87dc4616..5ce54dd1712 100644
--- a/tooling/camel-util-json/pom.xml
+++ b/tooling/camel-util-json/pom.xml
@@ -32,12 +32,6 @@
     <description>A json simple parser that preserves the ordering in Map as read from JSon source</description>
 
     <properties>
-        <camel.osgi.import.pkg>
-            *
-        </camel.osgi.import.pkg>
-        <camel.osgi.export.pkg>
-            org.apache.camel.util.json
-        </camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
@@ -51,54 +45,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-                <version>${project.version}</version>
-                <configuration>
-                    <supportIncrementalBuild>true</supportIncrementalBuild>
-                    <noWarningProjectTypes>pom</noWarningProjectTypes>
-                    <excludeDependencies>${camel.osgi.exclude.dependencies}</excludeDependencies>
-                    <instructions>
-                        <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Bundle-SymbolicName>${camel.osgi.symbolic.name}</Bundle-SymbolicName>
-                        <Bundle-Activator>${camel.osgi.activator}</Bundle-Activator>
-                        <Import-Package>${camel.osgi.import}</Import-Package>
-                        <Export-Package>${camel.osgi.export}</Export-Package>
-                        <DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
-                        <Private-Package>${camel.osgi.private.pkg}</Private-Package>
-                        <Require-Capability>${camel.osgi.require.capability}</Require-Capability>
-                        <Provide-Capability>${camel.osgi.provide.capability}</Provide-Capability>
-                        <Implementation-Title>Apache Camel</Implementation-Title>
-                        <Implementation-Version>${project.version}</Implementation-Version>
-                        <Karaf-Info>Camel;${project.artifactId}=${project.version}</Karaf-Info>
-                        <_versionpolicy>${camel.osgi.import.default.version}</_versionpolicy>
-                        <_failok>${camel.osgi.failok}</_failok>
-                        <_removeheaders>Bnd-LastModified</_removeheaders>
-                    </instructions>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>versions</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>cleanVersions</goal>
-                        </goals>
-                        <configuration>
-                            <versions>
-                                <camel.osgi.version.clean>${project.version}</camel.osgi.version.clean>
-                            </versions>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/tooling/maven/pom.xml b/tooling/maven/pom.xml
index 78b439a7f62..9944e4217be 100644
--- a/tooling/maven/pom.xml
+++ b/tooling/maven/pom.xml
@@ -72,21 +72,6 @@
             </plugins>
         </pluginManagement>
         <plugins>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-                <version>${project.version}</version>
-                <executions>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>none</phase>
-                    </execution>
-                    <execution>
-                        <id>versions</id>
-                        <phase>none</phase>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/tooling/openapi-rest-dsl-generator/pom.xml b/tooling/openapi-rest-dsl-generator/pom.xml
index 288fc564645..819c01fd475 100644
--- a/tooling/openapi-rest-dsl-generator/pom.xml
+++ b/tooling/openapi-rest-dsl-generator/pom.xml
@@ -33,10 +33,6 @@
     <description>Generator of REST DSL route definitions from OpenAPI specification</description>
 
     <properties>
-        <camel.osgi.import.pkg>
-            org.apache.camel.*;${camel.osgi.import.camel.version},
-            *
-        </camel.osgi.import.pkg>
     </properties>
 
     <dependencies>
@@ -102,54 +98,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-                <version>${project.version}</version>
-                <configuration>
-                    <supportIncrementalBuild>true</supportIncrementalBuild>
-                    <noWarningProjectTypes>pom</noWarningProjectTypes>
-                    <excludeDependencies>${camel.osgi.exclude.dependencies}</excludeDependencies>
-                    <instructions>
-                        <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Bundle-SymbolicName>${camel.osgi.symbolic.name}</Bundle-SymbolicName>
-                        <Bundle-Activator>${camel.osgi.activator}</Bundle-Activator>
-                        <Import-Package>${camel.osgi.import}</Import-Package>
-                        <Export-Package>${camel.osgi.export}</Export-Package>
-                        <DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
-                        <Private-Package>${camel.osgi.private.pkg}</Private-Package>
-                        <Require-Capability>${camel.osgi.require.capability}</Require-Capability>
-                        <Provide-Capability>${camel.osgi.provide.capability}</Provide-Capability>
-                        <Implementation-Title>Apache Camel</Implementation-Title>
-                        <Implementation-Version>${project.version}</Implementation-Version>
-                        <Karaf-Info>Camel;${project.artifactId}=${project.version}</Karaf-Info>
-                        <_versionpolicy>${camel.osgi.import.default.version}</_versionpolicy>
-                        <_failok>${camel.osgi.failok}</_failok>
-                        <_removeheaders>Bnd-LastModified</_removeheaders>
-                    </instructions>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>versions</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>cleanVersions</goal>
-                        </goals>
-                        <configuration>
-                            <versions>
-                                <camel.osgi.version.clean>${project.version}</camel.osgi.version.clean>
-                            </versions>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/tooling/pom.xml b/tooling/pom.xml
index 6917d8ca7ba..5c420e4d151 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -45,6 +45,5 @@
     </modules>
 
     <properties>
-        <camel.osgi.export.pkg />
     </properties>
 </project>
diff --git a/tooling/spi-annotations/pom.xml b/tooling/spi-annotations/pom.xml
index 2bd002e3752..1a3c500371f 100644
--- a/tooling/spi-annotations/pom.xml
+++ b/tooling/spi-annotations/pom.xml
@@ -33,13 +33,6 @@
     <description>Annotations for Camel Endpoint developers</description>
 
     <properties>
-        <camel.osgi.import.pkg>
-            *
-        </camel.osgi.import.pkg>
-        <camel.osgi.export.pkg>
-            org.apache.camel.spi;
-            org.apache.camel.spi.annotations
-        </camel.osgi.export.pkg>
     </properties>
 
     <dependencies>
@@ -47,54 +40,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-                <version>${project.version}</version>
-                <configuration>
-                    <supportIncrementalBuild>true</supportIncrementalBuild>
-                    <noWarningProjectTypes>pom</noWarningProjectTypes>
-                    <excludeDependencies>${camel.osgi.exclude.dependencies}</excludeDependencies>
-                    <instructions>
-                        <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Bundle-SymbolicName>${camel.osgi.symbolic.name}</Bundle-SymbolicName>
-                        <Bundle-Activator>${camel.osgi.activator}</Bundle-Activator>
-                        <Import-Package>${camel.osgi.import}</Import-Package>
-                        <Export-Package>${camel.osgi.export}</Export-Package>
-                        <DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
-                        <Private-Package>${camel.osgi.private.pkg}</Private-Package>
-                        <Require-Capability>${camel.osgi.require.capability}</Require-Capability>
-                        <Provide-Capability>${camel.osgi.provide.capability}</Provide-Capability>
-                        <Implementation-Title>Apache Camel</Implementation-Title>
-                        <Implementation-Version>${project.version}</Implementation-Version>
-                        <Karaf-Info>Camel;${project.artifactId}=${project.version}</Karaf-Info>
-                        <_versionpolicy>${camel.osgi.import.default.version}</_versionpolicy>
-                        <_failok>${camel.osgi.failok}</_failok>
-                        <_removeheaders>Bnd-LastModified</_removeheaders>
-                    </instructions>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>versions</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>cleanVersions</goal>
-                        </goals>
-                        <configuration>
-                            <versions>
-                                <camel.osgi.version.clean>${project.version}</camel.osgi.version.clean>
-                            </versions>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/tooling/swagger-rest-dsl-generator/pom.xml b/tooling/swagger-rest-dsl-generator/pom.xml
index df4a869ae11..e49ea06ec7e 100644
--- a/tooling/swagger-rest-dsl-generator/pom.xml
+++ b/tooling/swagger-rest-dsl-generator/pom.xml
@@ -32,10 +32,6 @@
     <description>Generator of REST DSL route definitions from Swagger (OpenAPI) specification</description>
 
     <properties>
-        <camel.osgi.import.pkg>
-            org.apache.camel.*;${camel.osgi.import.camel.version},
-            *
-        </camel.osgi.import.pkg>
     </properties>
 
     <dependencies>
@@ -83,54 +79,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-                <version>${project.version}</version>
-                <configuration>
-                    <supportIncrementalBuild>true</supportIncrementalBuild>
-                    <noWarningProjectTypes>pom</noWarningProjectTypes>
-                    <excludeDependencies>${camel.osgi.exclude.dependencies}</excludeDependencies>
-                    <instructions>
-                        <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Bundle-SymbolicName>${camel.osgi.symbolic.name}</Bundle-SymbolicName>
-                        <Bundle-Activator>${camel.osgi.activator}</Bundle-Activator>
-                        <Import-Package>${camel.osgi.import}</Import-Package>
-                        <Export-Package>${camel.osgi.export}</Export-Package>
-                        <DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
-                        <Private-Package>${camel.osgi.private.pkg}</Private-Package>
-                        <Require-Capability>${camel.osgi.require.capability}</Require-Capability>
-                        <Provide-Capability>${camel.osgi.provide.capability}</Provide-Capability>
-                        <Implementation-Title>Apache Camel</Implementation-Title>
-                        <Implementation-Version>${project.version}</Implementation-Version>
-                        <Karaf-Info>Camel;${project.artifactId}=${project.version}</Karaf-Info>
-                        <_versionpolicy>${camel.osgi.import.default.version}</_versionpolicy>
-                        <_failok>${camel.osgi.failok}</_failok>
-                        <_removeheaders>Bnd-LastModified</_removeheaders>
-                    </instructions>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>versions</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>cleanVersions</goal>
-                        </goals>
-                        <configuration>
-                            <versions>
-                                <camel.osgi.version.clean>${project.version}</camel.osgi.version.clean>
-                            </versions>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 


[camel] 05/08: Add support for jakarta in checkstyle

Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch jakarta-rewritten
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 41d7c3a402f96fe97d9635e1400e99043eab3509
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Nov 25 21:59:33 2022 +0100

    Add support for jakarta in checkstyle
---
 buildingtools/src/main/resources/camel-checkstyle.xml | 2 +-
 etc/pom.xml                                           | 2 +-
 pom.xml                                               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildingtools/src/main/resources/camel-checkstyle.xml b/buildingtools/src/main/resources/camel-checkstyle.xml
index 38ffb6ab37f..1928ee6e6bd 100644
--- a/buildingtools/src/main/resources/camel-checkstyle.xml
+++ b/buildingtools/src/main/resources/camel-checkstyle.xml
@@ -149,7 +149,7 @@ lengths, if/try depths, etc...
         <module name="UnusedImports"/>
         -->
         <module name="ImportOrder">
-            <property name="groups" value="java,javax,org.w3c,org.xml,junit"/>
+            <property name="groups" value="java,jakarta,javax,org.w3c,org.xml,junit"/>
             <property name="ordered" value="true"/>
             <property name="option" value="bottom"/>
             <property name="separated" value="true"/>
diff --git a/etc/pom.xml b/etc/pom.xml
index 37ed204e5c4..d4e0f28227c 100644
--- a/etc/pom.xml
+++ b/etc/pom.xml
@@ -126,7 +126,7 @@
                                             <entry key="org.eclipse.jdt.ui.text.custom_code_templates" value="${eclipse.code.templates}" />
 
                                             <!-- Add import order -->
-                                            <entry key="org.eclipse.jdt.ui.importorder" value="java;javax;org.w3c;org.xml;w3c;" />
+                                            <entry key="org.eclipse.jdt.ui.importorder" value="java;jakarta;javax;org.w3c;org.xml;w3c;" />
                                             <!-- Sort order -->
                                             <entry key="org.eclipse.jdt.ui.visibility.order" value="B,R,D,V," />
                                             <entry key="outlinesortoption" value="T,SF,F,SI,I,C,SM,M," />
diff --git a/pom.xml b/pom.xml
index 50ea06d1324..62e864231f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -568,7 +568,7 @@
                                             <entry key="org.eclipse.jdt.ui.text.custom_templates" value="${eclipse.camel.java.code.templates}" />
 
                                             <!-- Add import order -->
-                                            <entry key="org.eclipse.jdt.ui.importorder" value="java;javax;org.w3c;org.xml;w3c;" />
+                                            <entry key="org.eclipse.jdt.ui.importorder" value="java;jakarta;javax;org.w3c;org.xml;w3c;" />
                                             <!-- Sort order -->
                                             <entry key="org.eclipse.jdt.ui.visibility.order" value="B,R,D,V," />
                                             <entry key="outlinesortoption" value="T,SF,F,SI,I,C,SM,M," />


[camel] 04/08: Switch to javax.annotation.processing.Generated

Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch jakarta-rewritten
in repository https://gitbox.apache.org/repos/asf/camel.git

commit cfdcf7626c1521a87cfe22ca7e53ba0c82c66d10
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Nov 25 21:59:32 2022 +0100

    Switch to javax.annotation.processing.Generated
---
 .../component/dozer/example/xyz/LineItem.java      |   2 +-
 .../component/dozer/example/xyz/XYZOrder.java      |   2 +-
 .../src/main/resources/sobject-picklist.vm         |   2 +-
 .../src/main/resources/sobject-pojo-optional.vm    |   2 +-
 .../src/main/resources/sobject-pojo.vm             |   2 +-
 .../resources/sobject-query-records-optional.vm    |   2 +-
 .../src/main/resources/sobject-query-records.vm    |   2 +-
 .../salesforce/dto/generated/RecordType.java       |   2 +-
 .../src/main/resources/sobject-picklist.vm         |   2 +-
 .../src/main/resources/sobject-pojo-optional.vm    |   2 +-
 .../src/main/resources/sobject-pojo.vm             |   2 +-
 .../resources/sobject-query-records-optional.vm    |   2 +-
 .../src/main/resources/sobject-query-records.vm    |   2 +-
 .../src/test/resources/generated/Asset.java        |   2 +-
 .../resources/generated/Asset_LocalDateTime.java   |   2 +-
 .../src/test/resources/generated/Case.java         |   2 +-
 .../generated/Case_PickListAccentMarkEnum.java     |   2 +-
 .../generated/Case_PickListQuotationMarkEnum.java  |   2 +-
 .../generated/Case_PickListSlashEnum.java          |   2 +-
 .../generated/Case_PickListValueOverrideEnum.java  |   2 +-
 .../generated/ComplexCalculatedFormula.java        |   2 +-
 .../test/resources/generated/QueryRecordsCase.java |   2 +-
 .../QueryRecordsComplexCalculatedFormula.java      |   2 +-
 .../generated/With_External_Id__c_Lookup.java      |   2 +-
 .../resources/generated/With_Reference__c.java     |   2 +-
 .../camel/maven/CamelServiceNowGenerateMojo.java   |   2 +-
 .../component/thrift/generated/Calculator.java     |   2 +-
 .../thrift/generated/InvalidOperation.java         |   2 +-
 .../camel/component/thrift/generated/Work.java     |   2 +-
 .../camel/dataformat/thrift/generated/Work.java    |   2 +-
 .../dsl/DynamicRouterComponentBuilderFactory.java  |   2 +-
 .../dsl/DynamicRouterEndpointBuilderFactory.java   |   2 +-
 .../patterns/IsMockEndpointsAndSkipJUnit4Test.java |  64 ++++++++++-
 .../test/patterns/IsMockEndpointsJUnit4Test.java   |  71 +++++++++++-
 .../interceptor/AdviceWithMockEndpointsTest.java   | 120 ++++++++++++++++++++-
 ...dviceWithMockMultipleEndpointsWithSkipTest.java |  77 ++++++++++++-
 .../management/ManagedCustomProcessorTest.java     | 111 ++++++++++++++++++-
 .../component/ComponentsBuilderFactory.java        |   2 +-
 .../dsl/ActivemqComponentBuilderFactory.java       |   2 +-
 .../component/dsl/AmqpComponentBuilderFactory.java |   2 +-
 .../dsl/ArangodbComponentBuilderFactory.java       |   2 +-
 .../component/dsl/As2ComponentBuilderFactory.java  |   2 +-
 .../dsl/AsteriskComponentBuilderFactory.java       |   2 +-
 .../dsl/AtlasmapComponentBuilderFactory.java       |   2 +-
 .../dsl/AtmosComponentBuilderFactory.java          |   2 +-
 ...AtmosphereWebsocketComponentBuilderFactory.java |   2 +-
 .../component/dsl/AtomComponentBuilderFactory.java |   2 +-
 .../component/dsl/AvroComponentBuilderFactory.java |   2 +-
 .../dsl/Aws2AthenaComponentBuilderFactory.java     |   2 +-
 .../dsl/Aws2CwComponentBuilderFactory.java         |   2 +-
 .../dsl/Aws2DdbComponentBuilderFactory.java        |   2 +-
 .../dsl/Aws2DdbstreamComponentBuilderFactory.java  |   2 +-
 .../dsl/Aws2Ec2ComponentBuilderFactory.java        |   2 +-
 .../dsl/Aws2EcsComponentBuilderFactory.java        |   2 +-
 .../dsl/Aws2EksComponentBuilderFactory.java        |   2 +-
 .../Aws2EventbridgeComponentBuilderFactory.java    |   2 +-
 .../dsl/Aws2IamComponentBuilderFactory.java        |   2 +-
 .../dsl/Aws2KinesisComponentBuilderFactory.java    |   2 +-
 ...Aws2KinesisFirehoseComponentBuilderFactory.java |   2 +-
 .../dsl/Aws2KmsComponentBuilderFactory.java        |   2 +-
 .../dsl/Aws2LambdaComponentBuilderFactory.java     |   2 +-
 .../dsl/Aws2MqComponentBuilderFactory.java         |   2 +-
 .../dsl/Aws2MskComponentBuilderFactory.java        |   2 +-
 .../dsl/Aws2S3ComponentBuilderFactory.java         |   2 +-
 .../dsl/Aws2SesComponentBuilderFactory.java        |   2 +-
 .../dsl/Aws2SnsComponentBuilderFactory.java        |   2 +-
 .../dsl/Aws2SqsComponentBuilderFactory.java        |   2 +-
 .../dsl/Aws2StsComponentBuilderFactory.java        |   2 +-
 .../dsl/Aws2TranslateComponentBuilderFactory.java  |   2 +-
 .../dsl/AwsCloudtrailComponentBuilderFactory.java  |   2 +-
 .../AwsSecretsManagerComponentBuilderFactory.java  |   2 +-
 .../dsl/AzureCosmosdbComponentBuilderFactory.java  |   2 +-
 .../dsl/AzureEventhubsComponentBuilderFactory.java |   2 +-
 .../dsl/AzureKeyVaultComponentBuilderFactory.java  |   2 +-
 .../AzureServicebusComponentBuilderFactory.java    |   2 +-
 .../AzureStorageBlobComponentBuilderFactory.java   |   2 +-
 ...zureStorageDatalakeComponentBuilderFactory.java |   2 +-
 .../AzureStorageQueueComponentBuilderFactory.java  |   2 +-
 .../component/dsl/BeanComponentBuilderFactory.java |   2 +-
 .../dsl/BeanValidatorComponentBuilderFactory.java  |   2 +-
 .../dsl/BonitaComponentBuilderFactory.java         |   2 +-
 .../component/dsl/BoxComponentBuilderFactory.java  |   2 +-
 .../dsl/BraintreeComponentBuilderFactory.java      |   2 +-
 .../dsl/BrowseComponentBuilderFactory.java         |   2 +-
 .../dsl/CaffeineCacheComponentBuilderFactory.java  |   2 +-
 .../CaffeineLoadcacheComponentBuilderFactory.java  |   2 +-
 .../dsl/ChatscriptComponentBuilderFactory.java     |   2 +-
 .../dsl/ChunkComponentBuilderFactory.java          |   2 +-
 .../component/dsl/ClasComponentBuilderFactory.java |   2 +-
 .../dsl/CmSmsComponentBuilderFactory.java          |   2 +-
 .../component/dsl/CmisComponentBuilderFactory.java |   2 +-
 .../component/dsl/CoapComponentBuilderFactory.java |   2 +-
 .../dsl/CoapTcpComponentBuilderFactory.java        |   2 +-
 .../dsl/CoapsComponentBuilderFactory.java          |   2 +-
 .../dsl/CoapsTcpComponentBuilderFactory.java       |   2 +-
 .../dsl/CometdComponentBuilderFactory.java         |   2 +-
 .../dsl/CometdsComponentBuilderFactory.java        |   2 +-
 .../dsl/ConsulComponentBuilderFactory.java         |   2 +-
 .../dsl/ControlbusComponentBuilderFactory.java     |   2 +-
 .../dsl/CordaComponentBuilderFactory.java          |   2 +-
 .../dsl/CouchbaseComponentBuilderFactory.java      |   2 +-
 .../dsl/CouchdbComponentBuilderFactory.java        |   2 +-
 .../component/dsl/CqlComponentBuilderFactory.java  |   2 +-
 .../component/dsl/CronComponentBuilderFactory.java |   2 +-
 .../dsl/CryptoComponentBuilderFactory.java         |   2 +-
 .../component/dsl/CxfComponentBuilderFactory.java  |   2 +-
 .../dsl/CxfrsComponentBuilderFactory.java          |   2 +-
 .../dsl/DataformatComponentBuilderFactory.java     |   2 +-
 .../dsl/DatasetComponentBuilderFactory.java        |   2 +-
 .../dsl/DatasetTestComponentBuilderFactory.java    |   2 +-
 .../dsl/DebeziumDb2ComponentBuilderFactory.java    |   2 +-
 .../DebeziumMongodbComponentBuilderFactory.java    |   2 +-
 .../dsl/DebeziumMysqlComponentBuilderFactory.java  |   2 +-
 .../dsl/DebeziumOracleComponentBuilderFactory.java |   2 +-
 .../DebeziumPostgresComponentBuilderFactory.java   |   2 +-
 .../DebeziumSqlserverComponentBuilderFactory.java  |   2 +-
 .../dsl/DigitaloceanComponentBuilderFactory.java   |   2 +-
 .../dsl/DirectComponentBuilderFactory.java         |   2 +-
 .../dsl/DirectVmComponentBuilderFactory.java       |   2 +-
 .../dsl/DisruptorComponentBuilderFactory.java      |   2 +-
 .../dsl/DisruptorVmComponentBuilderFactory.java    |   2 +-
 .../component/dsl/DjlComponentBuilderFactory.java  |   2 +-
 .../component/dsl/DnsComponentBuilderFactory.java  |   2 +-
 .../dsl/DockerComponentBuilderFactory.java         |   2 +-
 .../dsl/DozerComponentBuilderFactory.java          |   2 +-
 .../dsl/DrillComponentBuilderFactory.java          |   2 +-
 .../dsl/DropboxComponentBuilderFactory.java        |   2 +-
 .../dsl/DynamicRouterComponentBuilderFactory.java  |   2 +-
 .../dsl/EhcacheComponentBuilderFactory.java        |   2 +-
 .../dsl/ElasticsearchComponentBuilderFactory.java  |   2 +-
 .../ElasticsearchRestComponentBuilderFactory.java  |   2 +-
 .../dsl/Etcd3ComponentBuilderFactory.java          |   2 +-
 .../component/dsl/ExecComponentBuilderFactory.java |   2 +-
 .../dsl/FacebookComponentBuilderFactory.java       |   2 +-
 .../component/dsl/FhirComponentBuilderFactory.java |   2 +-
 .../component/dsl/FileComponentBuilderFactory.java |   2 +-
 .../dsl/FileWatchComponentBuilderFactory.java      |   2 +-
 .../dsl/FlatpackComponentBuilderFactory.java       |   2 +-
 .../dsl/FlinkComponentBuilderFactory.java          |   2 +-
 .../component/dsl/FopComponentBuilderFactory.java  |   2 +-
 .../dsl/FreemarkerComponentBuilderFactory.java     |   2 +-
 .../component/dsl/FtpComponentBuilderFactory.java  |   2 +-
 .../component/dsl/FtpsComponentBuilderFactory.java |   2 +-
 .../dsl/GeocoderComponentBuilderFactory.java       |   2 +-
 .../component/dsl/GitComponentBuilderFactory.java  |   2 +-
 .../dsl/GithubComponentBuilderFactory.java         |   2 +-
 .../dsl/GoogleBigqueryComponentBuilderFactory.java |   2 +-
 .../GoogleBigquerySqlComponentBuilderFactory.java  |   2 +-
 .../dsl/GoogleCalendarComponentBuilderFactory.java |   2 +-
 ...oogleCalendarStreamComponentBuilderFactory.java |   2 +-
 .../dsl/GoogleDriveComponentBuilderFactory.java    |   2 +-
 .../GoogleFunctionsComponentBuilderFactory.java    |   2 +-
 .../dsl/GoogleMailComponentBuilderFactory.java     |   2 +-
 .../GoogleMailStreamComponentBuilderFactory.java   |   2 +-
 .../dsl/GooglePubsubComponentBuilderFactory.java   |   2 +-
 ...GoogleSecretManagerComponentBuilderFactory.java |   2 +-
 .../dsl/GoogleSheetsComponentBuilderFactory.java   |   2 +-
 .../GoogleSheetsStreamComponentBuilderFactory.java |   2 +-
 .../dsl/GoogleStorageComponentBuilderFactory.java  |   2 +-
 .../component/dsl/GoraComponentBuilderFactory.java |   2 +-
 .../dsl/GrapeComponentBuilderFactory.java          |   2 +-
 .../dsl/GraphqlComponentBuilderFactory.java        |   2 +-
 .../component/dsl/GrpcComponentBuilderFactory.java |   2 +-
 .../dsl/GuavaEventbusComponentBuilderFactory.java  |   2 +-
 .../dsl/HashicorpVaultComponentBuilderFactory.java |   2 +-
 ...azelcastAtomicvalueComponentBuilderFactory.java |   2 +-
 .../HazelcastInstanceComponentBuilderFactory.java  |   2 +-
 .../dsl/HazelcastListComponentBuilderFactory.java  |   2 +-
 .../dsl/HazelcastMapComponentBuilderFactory.java   |   2 +-
 .../HazelcastMultimapComponentBuilderFactory.java  |   2 +-
 .../dsl/HazelcastQueueComponentBuilderFactory.java |   2 +-
 ...elcastReplicatedmapComponentBuilderFactory.java |   2 +-
 ...HazelcastRingbufferComponentBuilderFactory.java |   2 +-
 .../dsl/HazelcastSedaComponentBuilderFactory.java  |   2 +-
 .../dsl/HazelcastSetComponentBuilderFactory.java   |   2 +-
 .../dsl/HazelcastTopicComponentBuilderFactory.java |   2 +-
 .../dsl/HbaseComponentBuilderFactory.java          |   2 +-
 .../component/dsl/HdfsComponentBuilderFactory.java |   2 +-
 .../component/dsl/HttpComponentBuilderFactory.java |   2 +-
 .../dsl/HttpsComponentBuilderFactory.java          |   2 +-
 .../dsl/HwcloudDmsComponentBuilderFactory.java     |   2 +-
 .../dsl/HwcloudFrsComponentBuilderFactory.java     |   2 +-
 ...wcloudFunctiongraphComponentBuilderFactory.java |   2 +-
 .../dsl/HwcloudIamComponentBuilderFactory.java     |   2 +-
 ...oudImagerecognitionComponentBuilderFactory.java |   2 +-
 .../dsl/HwcloudObsComponentBuilderFactory.java     |   2 +-
 .../dsl/HwcloudSmnComponentBuilderFactory.java     |   2 +-
 .../HyperledgerAriesComponentBuilderFactory.java   |   2 +-
 .../dsl/Iec60870ClientComponentBuilderFactory.java |   2 +-
 .../dsl/Iec60870ServerComponentBuilderFactory.java |   2 +-
 .../dsl/IgniteCacheComponentBuilderFactory.java    |   2 +-
 .../dsl/IgniteComputeComponentBuilderFactory.java  |   2 +-
 .../dsl/IgniteEventsComponentBuilderFactory.java   |   2 +-
 .../dsl/IgniteIdgenComponentBuilderFactory.java    |   2 +-
 .../IgniteMessagingComponentBuilderFactory.java    |   2 +-
 .../dsl/IgniteQueueComponentBuilderFactory.java    |   2 +-
 .../dsl/IgniteSetComponentBuilderFactory.java      |   2 +-
 .../component/dsl/ImapComponentBuilderFactory.java |   2 +-
 .../dsl/ImapsComponentBuilderFactory.java          |   2 +-
 .../dsl/InfinispanComponentBuilderFactory.java     |   2 +-
 .../InfinispanEmbeddedComponentBuilderFactory.java |   2 +-
 .../dsl/InfluxdbComponentBuilderFactory.java       |   2 +-
 .../component/dsl/IotaComponentBuilderFactory.java |   2 +-
 .../component/dsl/IpfsComponentBuilderFactory.java |   2 +-
 .../component/dsl/IrcComponentBuilderFactory.java  |   2 +-
 .../dsl/IronmqComponentBuilderFactory.java         |   2 +-
 .../component/dsl/JbpmComponentBuilderFactory.java |   2 +-
 .../dsl/JcacheComponentBuilderFactory.java         |   2 +-
 .../dsl/JcloudsComponentBuilderFactory.java        |   2 +-
 .../component/dsl/JcrComponentBuilderFactory.java  |   2 +-
 .../component/dsl/JdbcComponentBuilderFactory.java |   2 +-
 .../dsl/JettyComponentBuilderFactory.java          |   2 +-
 .../dsl/JgroupsComponentBuilderFactory.java        |   2 +-
 .../dsl/JgroupsRaftComponentBuilderFactory.java    |   2 +-
 .../component/dsl/JiraComponentBuilderFactory.java |   2 +-
 .../component/dsl/JmsComponentBuilderFactory.java  |   2 +-
 .../component/dsl/JmxComponentBuilderFactory.java  |   2 +-
 .../component/dsl/JoltComponentBuilderFactory.java |   2 +-
 .../component/dsl/JooqComponentBuilderFactory.java |   2 +-
 .../component/dsl/JpaComponentBuilderFactory.java  |   2 +-
 .../component/dsl/JsltComponentBuilderFactory.java |   2 +-
 .../dsl/JsonPatchComponentBuilderFactory.java      |   2 +-
 .../dsl/JsonValidatorComponentBuilderFactory.java  |   2 +-
 .../dsl/JsonataComponentBuilderFactory.java        |   2 +-
 .../dsl/Jt400ComponentBuilderFactory.java          |   2 +-
 .../dsl/KafkaComponentBuilderFactory.java          |   2 +-
 .../dsl/KameletComponentBuilderFactory.java        |   2 +-
 .../dsl/KnativeComponentBuilderFactory.java        |   2 +-
 ...ubernetesConfigMapsComponentBuilderFactory.java |   2 +-
 ...etesCustomResourcesComponentBuilderFactory.java |   2 +-
 ...bernetesDeploymentsComponentBuilderFactory.java |   2 +-
 .../KubernetesEventsComponentBuilderFactory.java   |   2 +-
 .../dsl/KubernetesHpaComponentBuilderFactory.java  |   2 +-
 .../dsl/KubernetesJobComponentBuilderFactory.java  |   2 +-
 ...ubernetesNamespacesComponentBuilderFactory.java |   2 +-
 .../KubernetesNodesComponentBuilderFactory.java    |   2 +-
 ...istentVolumesClaimsComponentBuilderFactory.java |   2 +-
 ...esPersistentVolumesComponentBuilderFactory.java |   2 +-
 .../dsl/KubernetesPodsComponentBuilderFactory.java |   2 +-
 ...licationControllersComponentBuilderFactory.java |   2 +-
 ...netesResourcesQuotaComponentBuilderFactory.java |   2 +-
 .../KubernetesSecretsComponentBuilderFactory.java  |   2 +-
 ...etesServiceAccountsComponentBuilderFactory.java |   2 +-
 .../KubernetesServicesComponentBuilderFactory.java |   2 +-
 .../component/dsl/KuduComponentBuilderFactory.java |   2 +-
 .../dsl/LanguageComponentBuilderFactory.java       |   2 +-
 .../component/dsl/LdapComponentBuilderFactory.java |   2 +-
 .../component/dsl/LdifComponentBuilderFactory.java |   2 +-
 .../component/dsl/LogComponentBuilderFactory.java  |   2 +-
 .../component/dsl/LprComponentBuilderFactory.java  |   2 +-
 .../dsl/LuceneComponentBuilderFactory.java         |   2 +-
 .../dsl/LumberjackComponentBuilderFactory.java     |   2 +-
 .../dsl/MapstructComponentBuilderFactory.java      |   2 +-
 .../dsl/MasterComponentBuilderFactory.java         |   2 +-
 .../dsl/MetricsComponentBuilderFactory.java        |   2 +-
 .../dsl/MicrometerComponentBuilderFactory.java     |   2 +-
 ...MicroprofileMetricsComponentBuilderFactory.java |   2 +-
 .../dsl/MiloBrowseComponentBuilderFactory.java     |   2 +-
 .../dsl/MiloClientComponentBuilderFactory.java     |   2 +-
 .../dsl/MiloServerComponentBuilderFactory.java     |   2 +-
 .../component/dsl/MinaComponentBuilderFactory.java |   2 +-
 .../dsl/MinioComponentBuilderFactory.java          |   2 +-
 .../component/dsl/MllpComponentBuilderFactory.java |   2 +-
 .../component/dsl/MockComponentBuilderFactory.java |   2 +-
 .../dsl/MongodbComponentBuilderFactory.java        |   2 +-
 .../dsl/MongodbGridfsComponentBuilderFactory.java  |   2 +-
 .../dsl/MustacheComponentBuilderFactory.java       |   2 +-
 .../component/dsl/MvelComponentBuilderFactory.java |   2 +-
 .../dsl/MybatisBeanComponentBuilderFactory.java    |   2 +-
 .../dsl/MybatisComponentBuilderFactory.java        |   2 +-
 .../component/dsl/NatsComponentBuilderFactory.java |   2 +-
 .../dsl/NettyComponentBuilderFactory.java          |   2 +-
 .../dsl/NettyHttpComponentBuilderFactory.java      |   2 +-
 .../dsl/NitriteComponentBuilderFactory.java        |   2 +-
 .../dsl/OaipmhComponentBuilderFactory.java         |   2 +-
 .../dsl/Olingo2ComponentBuilderFactory.java        |   2 +-
 .../dsl/Olingo4ComponentBuilderFactory.java        |   2 +-
 ...enshiftBuildConfigsComponentBuilderFactory.java |   2 +-
 .../OpenshiftBuildsComponentBuilderFactory.java    |   2 +-
 ...ftDeploymentconfigsComponentBuilderFactory.java |   2 +-
 .../OpenstackCinderComponentBuilderFactory.java    |   2 +-
 .../OpenstackGlanceComponentBuilderFactory.java    |   2 +-
 .../OpenstackKeystoneComponentBuilderFactory.java  |   2 +-
 .../OpenstackNeutronComponentBuilderFactory.java   |   2 +-
 .../dsl/OpenstackNovaComponentBuilderFactory.java  |   2 +-
 .../dsl/OpenstackSwiftComponentBuilderFactory.java |   2 +-
 .../dsl/OptaplannerComponentBuilderFactory.java    |   2 +-
 .../component/dsl/PahoComponentBuilderFactory.java |   2 +-
 .../dsl/PahoMqtt5ComponentBuilderFactory.java      |   2 +-
 .../component/dsl/PdfComponentBuilderFactory.java  |   2 +-
 .../PgReplicationSlotComponentBuilderFactory.java  |   2 +-
 .../dsl/PgeventComponentBuilderFactory.java        |   2 +-
 .../dsl/PlatformHttpComponentBuilderFactory.java   |   2 +-
 .../dsl/Plc4xComponentBuilderFactory.java          |   2 +-
 .../component/dsl/Pop3ComponentBuilderFactory.java |   2 +-
 .../dsl/Pop3sComponentBuilderFactory.java          |   2 +-
 .../dsl/PubnubComponentBuilderFactory.java         |   2 +-
 .../dsl/PulsarComponentBuilderFactory.java         |   2 +-
 .../dsl/QuartzComponentBuilderFactory.java         |   2 +-
 .../dsl/QuickfixComponentBuilderFactory.java       |   2 +-
 .../dsl/RabbitmqComponentBuilderFactory.java       |   2 +-
 .../ReactiveStreamsComponentBuilderFactory.java    |   2 +-
 .../component/dsl/RefComponentBuilderFactory.java  |   2 +-
 .../dsl/RestApiComponentBuilderFactory.java        |   2 +-
 .../dsl/RestEndpointComponentBuilderFactory.java   |   2 +-
 .../dsl/RestOpenapiComponentBuilderFactory.java    |   2 +-
 .../dsl/RestSwaggerComponentBuilderFactory.java    |   2 +-
 .../dsl/ResteasyComponentBuilderFactory.java       |   2 +-
 .../dsl/RobotframeworkComponentBuilderFactory.java |   2 +-
 .../component/dsl/RssComponentBuilderFactory.java  |   2 +-
 .../component/dsl/SagaComponentBuilderFactory.java |   2 +-
 .../dsl/SalesforceComponentBuilderFactory.java     |   2 +-
 .../dsl/SapNetweaverComponentBuilderFactory.java   |   2 +-
 .../dsl/SchedulerComponentBuilderFactory.java      |   2 +-
 .../dsl/SchematronComponentBuilderFactory.java     |   2 +-
 .../component/dsl/ScpComponentBuilderFactory.java  |   2 +-
 .../component/dsl/SedaComponentBuilderFactory.java |   2 +-
 .../dsl/ServiceComponentBuilderFactory.java        |   2 +-
 .../dsl/ServicenowComponentBuilderFactory.java     |   2 +-
 .../dsl/ServletComponentBuilderFactory.java        |   2 +-
 .../component/dsl/SftpComponentBuilderFactory.java |   2 +-
 .../dsl/Sjms2ComponentBuilderFactory.java          |   2 +-
 .../component/dsl/SjmsComponentBuilderFactory.java |   2 +-
 .../dsl/SlackComponentBuilderFactory.java          |   2 +-
 .../component/dsl/SmppComponentBuilderFactory.java |   2 +-
 .../dsl/SmppsComponentBuilderFactory.java          |   2 +-
 .../component/dsl/SmtpComponentBuilderFactory.java |   2 +-
 .../dsl/SmtpsComponentBuilderFactory.java          |   2 +-
 .../component/dsl/SnmpComponentBuilderFactory.java |   2 +-
 .../component/dsl/SolrComponentBuilderFactory.java |   2 +-
 .../dsl/SolrcloudComponentBuilderFactory.java      |   2 +-
 .../dsl/SolrsComponentBuilderFactory.java          |   2 +-
 .../dsl/SparkComponentBuilderFactory.java          |   2 +-
 .../dsl/SplunkComponentBuilderFactory.java         |   2 +-
 .../dsl/SplunkHecComponentBuilderFactory.java      |   2 +-
 .../dsl/SpringBatchComponentBuilderFactory.java    |   2 +-
 .../dsl/SpringEventComponentBuilderFactory.java    |   2 +-
 .../SpringIntegrationComponentBuilderFactory.java  |   2 +-
 .../dsl/SpringJdbcComponentBuilderFactory.java     |   2 +-
 .../dsl/SpringLdapComponentBuilderFactory.java     |   2 +-
 .../dsl/SpringRabbitmqComponentBuilderFactory.java |   2 +-
 .../dsl/SpringRedisComponentBuilderFactory.java    |   2 +-
 .../dsl/SpringWsComponentBuilderFactory.java       |   2 +-
 .../component/dsl/SqlComponentBuilderFactory.java  |   2 +-
 .../dsl/SqlStoredComponentBuilderFactory.java      |   2 +-
 .../component/dsl/SshComponentBuilderFactory.java  |   2 +-
 .../component/dsl/StaxComponentBuilderFactory.java |   2 +-
 .../dsl/StitchComponentBuilderFactory.java         |   2 +-
 .../dsl/StompComponentBuilderFactory.java          |   2 +-
 .../dsl/StreamComponentBuilderFactory.java         |   2 +-
 .../dsl/StringTemplateComponentBuilderFactory.java |   2 +-
 .../component/dsl/StubComponentBuilderFactory.java |   2 +-
 .../dsl/TelegramComponentBuilderFactory.java       |   2 +-
 .../dsl/ThriftComponentBuilderFactory.java         |   2 +-
 .../component/dsl/TikaComponentBuilderFactory.java |   2 +-
 .../dsl/TimerComponentBuilderFactory.java          |   2 +-
 .../dsl/TwilioComponentBuilderFactory.java         |   2 +-
 ...witterDirectmessageComponentBuilderFactory.java |   2 +-
 .../dsl/TwitterSearchComponentBuilderFactory.java  |   2 +-
 .../TwitterTimelineComponentBuilderFactory.java    |   2 +-
 .../dsl/UndertowComponentBuilderFactory.java       |   2 +-
 .../dsl/ValidatorComponentBuilderFactory.java      |   2 +-
 .../dsl/VelocityComponentBuilderFactory.java       |   2 +-
 .../dsl/VertxComponentBuilderFactory.java          |   2 +-
 .../dsl/VertxHttpComponentBuilderFactory.java      |   2 +-
 .../dsl/VertxKafkaComponentBuilderFactory.java     |   2 +-
 .../dsl/VertxWebsocketComponentBuilderFactory.java |   2 +-
 .../component/dsl/VmComponentBuilderFactory.java   |   2 +-
 .../dsl/WeatherComponentBuilderFactory.java        |   2 +-
 .../dsl/Web3jComponentBuilderFactory.java          |   2 +-
 .../dsl/WebhookComponentBuilderFactory.java        |   2 +-
 .../dsl/WebsocketComponentBuilderFactory.java      |   2 +-
 .../WebsocketJsr356ComponentBuilderFactory.java    |   2 +-
 .../component/dsl/WekaComponentBuilderFactory.java |   2 +-
 .../dsl/WhatsappComponentBuilderFactory.java       |   2 +-
 .../dsl/WordpressComponentBuilderFactory.java      |   2 +-
 .../dsl/WorkdayComponentBuilderFactory.java        |   2 +-
 .../dsl/XchangeComponentBuilderFactory.java        |   2 +-
 .../component/dsl/XjComponentBuilderFactory.java   |   2 +-
 .../XmlsecuritySignComponentBuilderFactory.java    |   2 +-
 .../XmlsecurityVerifyComponentBuilderFactory.java  |   2 +-
 .../component/dsl/XmppComponentBuilderFactory.java |   2 +-
 .../dsl/XqueryComponentBuilderFactory.java         |   2 +-
 .../component/dsl/XsltComponentBuilderFactory.java |   2 +-
 .../dsl/XsltSaxonComponentBuilderFactory.java      |   2 +-
 .../dsl/ZendeskComponentBuilderFactory.java        |   2 +-
 .../dsl/ZookeeperComponentBuilderFactory.java      |   2 +-
 .../ZookeeperMasterComponentBuilderFactory.java    |   2 +-
 .../builder/endpoint/EndpointBuilderFactory.java   |   2 +-
 .../camel/builder/endpoint/EndpointBuilders.java   |   2 +-
 .../builder/endpoint/StaticEndpointBuilders.java   |   2 +-
 .../endpoint/dsl/AMQPEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/AS2EndpointBuilderFactory.java    |   2 +-
 .../dsl/AWS2EC2EndpointBuilderFactory.java         |   2 +-
 .../endpoint/dsl/AWS2S3EndpointBuilderFactory.java |   2 +-
 .../dsl/ActiveMQEndpointBuilderFactory.java        |   2 +-
 .../dsl/ArangoDbEndpointBuilderFactory.java        |   2 +-
 .../dsl/AsteriskEndpointBuilderFactory.java        |   2 +-
 .../dsl/Athena2EndpointBuilderFactory.java         |   2 +-
 .../dsl/AtlasMapEndpointBuilderFactory.java        |   2 +-
 .../endpoint/dsl/AtmosEndpointBuilderFactory.java  |   2 +-
 .../AtmosphereWebsocketEndpointBuilderFactory.java |   2 +-
 .../endpoint/dsl/AtomEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/AvroEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/BeanEndpointBuilderFactory.java   |   2 +-
 .../dsl/BeanValidatorEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/BlobEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/BonitaEndpointBuilderFactory.java |   2 +-
 .../endpoint/dsl/BoxEndpointBuilderFactory.java    |   2 +-
 .../dsl/BraintreeEndpointBuilderFactory.java       |   2 +-
 .../endpoint/dsl/BrowseEndpointBuilderFactory.java |   2 +-
 .../endpoint/dsl/CMEndpointBuilderFactory.java     |   2 +-
 .../endpoint/dsl/CMISEndpointBuilderFactory.java   |   2 +-
 .../dsl/CaffeineCacheEndpointBuilderFactory.java   |   2 +-
 .../CaffeineLoadCacheEndpointBuilderFactory.java   |   2 +-
 .../dsl/CassandraEndpointBuilderFactory.java       |   2 +-
 .../dsl/ChatScriptEndpointBuilderFactory.java      |   2 +-
 .../endpoint/dsl/ChunkEndpointBuilderFactory.java  |   2 +-
 .../endpoint/dsl/CinderEndpointBuilderFactory.java |   2 +-
 .../endpoint/dsl/ClassEndpointBuilderFactory.java  |   2 +-
 .../endpoint/dsl/ClientEndpointBuilderFactory.java |   2 +-
 .../dsl/CloudtrailEndpointBuilderFactory.java      |   2 +-
 .../endpoint/dsl/CoAPEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/CometdEndpointBuilderFactory.java |   2 +-
 .../endpoint/dsl/ConsulEndpointBuilderFactory.java |   2 +-
 .../dsl/ControlBusEndpointBuilderFactory.java      |   2 +-
 .../endpoint/dsl/CordaEndpointBuilderFactory.java  |   2 +-
 .../dsl/CosmosDbEndpointBuilderFactory.java        |   2 +-
 .../dsl/CouchDbEndpointBuilderFactory.java         |   2 +-
 .../dsl/CouchbaseEndpointBuilderFactory.java       |   2 +-
 .../endpoint/dsl/CronEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/Cw2EndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/CxfEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/CxfRsEndpointBuilderFactory.java  |   2 +-
 .../endpoint/dsl/DJLEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/DMSEndpointBuilderFactory.java    |   2 +-
 .../dsl/DataFormatEndpointBuilderFactory.java      |   2 +-
 .../dsl/DataLakeEndpointBuilderFactory.java        |   2 +-
 .../dsl/DataSetEndpointBuilderFactory.java         |   2 +-
 .../dsl/DataSetTestEndpointBuilderFactory.java     |   2 +-
 .../endpoint/dsl/Ddb2EndpointBuilderFactory.java   |   2 +-
 .../dsl/Ddb2StreamEndpointBuilderFactory.java      |   2 +-
 .../dsl/DebeziumDb2EndpointBuilderFactory.java     |   2 +-
 .../dsl/DebeziumMongodbEndpointBuilderFactory.java |   2 +-
 .../dsl/DebeziumMySqlEndpointBuilderFactory.java   |   2 +-
 .../dsl/DebeziumOracleEndpointBuilderFactory.java  |   2 +-
 .../DebeziumPostgresEndpointBuilderFactory.java    |   2 +-
 .../DebeziumSqlserverEndpointBuilderFactory.java   |   2 +-
 .../dsl/DigitalOceanEndpointBuilderFactory.java    |   2 +-
 .../DigitalSignatureEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/DirectEndpointBuilderFactory.java |   2 +-
 .../dsl/DirectVmEndpointBuilderFactory.java        |   2 +-
 .../dsl/DisruptorEndpointBuilderFactory.java       |   2 +-
 .../dsl/DisruptorVmEndpointBuilderFactory.java     |   2 +-
 .../endpoint/dsl/DnsEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/DockerEndpointBuilderFactory.java |   2 +-
 .../endpoint/dsl/DozerEndpointBuilderFactory.java  |   2 +-
 .../endpoint/dsl/DrillEndpointBuilderFactory.java  |   2 +-
 .../dsl/DropboxEndpointBuilderFactory.java         |   2 +-
 .../dsl/DynamicRouterEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/ECS2EndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/EKS2EndpointBuilderFactory.java   |   2 +-
 .../dsl/EhcacheEndpointBuilderFactory.java         |   2 +-
 .../dsl/ElasticsearchEndpointBuilderFactory.java   |   2 +-
 .../ElasticsearchRestEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/Etcd3EndpointBuilderFactory.java  |   2 +-
 .../endpoint/dsl/EventEndpointBuilderFactory.java  |   2 +-
 .../dsl/EventHubsEndpointBuilderFactory.java       |   2 +-
 .../dsl/EventbridgeEndpointBuilderFactory.java     |   2 +-
 .../endpoint/dsl/ExecEndpointBuilderFactory.java   |   2 +-
 .../dsl/FaceRecognitionEndpointBuilderFactory.java |   2 +-
 .../dsl/FacebookEndpointBuilderFactory.java        |   2 +-
 .../endpoint/dsl/FhirEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/FileEndpointBuilderFactory.java   |   2 +-
 .../dsl/FileWatchEndpointBuilderFactory.java       |   2 +-
 .../dsl/FlatpackEndpointBuilderFactory.java        |   2 +-
 .../endpoint/dsl/FlinkEndpointBuilderFactory.java  |   2 +-
 .../endpoint/dsl/FopEndpointBuilderFactory.java    |   2 +-
 .../dsl/FreemarkerEndpointBuilderFactory.java      |   2 +-
 .../endpoint/dsl/FtpEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/FtpsEndpointBuilderFactory.java   |   2 +-
 .../dsl/FunctionGraphEndpointBuilderFactory.java   |   2 +-
 .../dsl/GeoCoderEndpointBuilderFactory.java        |   2 +-
 .../endpoint/dsl/GitEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/GitHubEndpointBuilderFactory.java |   2 +-
 .../endpoint/dsl/GlanceEndpointBuilderFactory.java |   2 +-
 .../dsl/GoogleBigQueryEndpointBuilderFactory.java  |   2 +-
 .../GoogleBigQuerySQLEndpointBuilderFactory.java   |   2 +-
 .../dsl/GoogleCalendarEndpointBuilderFactory.java  |   2 +-
 ...GoogleCalendarStreamEndpointBuilderFactory.java |   2 +-
 ...GoogleCloudFunctionsEndpointBuilderFactory.java |   2 +-
 .../GoogleCloudStorageEndpointBuilderFactory.java  |   2 +-
 .../dsl/GoogleDriveEndpointBuilderFactory.java     |   2 +-
 .../dsl/GoogleMailEndpointBuilderFactory.java      |   2 +-
 .../GoogleMailStreamEndpointBuilderFactory.java    |   2 +-
 .../dsl/GooglePubsubEndpointBuilderFactory.java    |   2 +-
 .../GoogleSecretManagerEndpointBuilderFactory.java |   2 +-
 .../dsl/GoogleSheetsEndpointBuilderFactory.java    |   2 +-
 .../GoogleSheetsStreamEndpointBuilderFactory.java  |   2 +-
 .../endpoint/dsl/GoraEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/GrapeEndpointBuilderFactory.java  |   2 +-
 .../dsl/GraphqlEndpointBuilderFactory.java         |   2 +-
 .../endpoint/dsl/GridFsEndpointBuilderFactory.java |   2 +-
 .../endpoint/dsl/GrpcEndpointBuilderFactory.java   |   2 +-
 .../dsl/GuavaEventBusEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/HBaseEndpointBuilderFactory.java  |   2 +-
 .../dsl/HashicorpVaultEndpointBuilderFactory.java  |   2 +-
 ...azelcastAtomicnumberEndpointBuilderFactory.java |   2 +-
 .../HazelcastInstanceEndpointBuilderFactory.java   |   2 +-
 .../dsl/HazelcastListEndpointBuilderFactory.java   |   2 +-
 .../dsl/HazelcastMapEndpointBuilderFactory.java    |   2 +-
 .../HazelcastMultimapEndpointBuilderFactory.java   |   2 +-
 .../dsl/HazelcastQueueEndpointBuilderFactory.java  |   2 +-
 ...zelcastReplicatedmapEndpointBuilderFactory.java |   2 +-
 .../HazelcastRingbufferEndpointBuilderFactory.java |   2 +-
 .../dsl/HazelcastSedaEndpointBuilderFactory.java   |   2 +-
 .../dsl/HazelcastSetEndpointBuilderFactory.java    |   2 +-
 .../dsl/HazelcastTopicEndpointBuilderFactory.java  |   2 +-
 .../endpoint/dsl/HdfsEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/HttpEndpointBuilderFactory.java   |   2 +-
 .../HyperledgerAriesEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/IAM2EndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/IAMEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/IOTAEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/IPFSEndpointBuilderFactory.java   |   2 +-
 .../dsl/IgniteCacheEndpointBuilderFactory.java     |   2 +-
 .../dsl/IgniteComputeEndpointBuilderFactory.java   |   2 +-
 .../dsl/IgniteEventsEndpointBuilderFactory.java    |   2 +-
 .../dsl/IgniteIdGenEndpointBuilderFactory.java     |   2 +-
 .../dsl/IgniteMessagingEndpointBuilderFactory.java |   2 +-
 .../dsl/IgniteQueueEndpointBuilderFactory.java     |   2 +-
 .../dsl/IgniteSetEndpointBuilderFactory.java       |   2 +-
 .../ImageRecognitionEndpointBuilderFactory.java    |   2 +-
 .../InfinispanEmbeddedEndpointBuilderFactory.java  |   2 +-
 .../InfinispanRemoteEndpointBuilderFactory.java    |   2 +-
 .../dsl/InfluxDbEndpointBuilderFactory.java        |   2 +-
 .../endpoint/dsl/IrcEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/IronMQEndpointBuilderFactory.java |   2 +-
 .../endpoint/dsl/JBPMEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/JCacheEndpointBuilderFactory.java |   2 +-
 .../dsl/JGroupsEndpointBuilderFactory.java         |   2 +-
 .../dsl/JGroupsRaftEndpointBuilderFactory.java     |   2 +-
 .../endpoint/dsl/JMXEndpointBuilderFactory.java    |   2 +-
 .../dsl/JSR356WebSocketEndpointBuilderFactory.java |   2 +-
 .../dsl/JcloudsEndpointBuilderFactory.java         |   2 +-
 .../endpoint/dsl/JcrEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/JdbcEndpointBuilderFactory.java   |   2 +-
 .../dsl/JettyHttpEndpointBuilderFactory.java       |   2 +-
 .../endpoint/dsl/JiraEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/JmsEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/JoltEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/JooqEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/JpaEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/JsltEndpointBuilderFactory.java   |   2 +-
 .../dsl/JsonPatchEndpointBuilderFactory.java       |   2 +-
 .../dsl/JsonValidatorEndpointBuilderFactory.java   |   2 +-
 .../dsl/JsonataEndpointBuilderFactory.java         |   2 +-
 .../endpoint/dsl/Jt400EndpointBuilderFactory.java  |   2 +-
 .../endpoint/dsl/KMS2EndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/KafkaEndpointBuilderFactory.java  |   2 +-
 .../dsl/KameletEndpointBuilderFactory.java         |   2 +-
 .../dsl/KeyVaultEndpointBuilderFactory.java        |   2 +-
 .../dsl/KeystoneEndpointBuilderFactory.java        |   2 +-
 .../dsl/Kinesis2EndpointBuilderFactory.java        |   2 +-
 .../KinesisFirehose2EndpointBuilderFactory.java    |   2 +-
 .../dsl/KnativeEndpointBuilderFactory.java         |   2 +-
 ...KubernetesConfigMapsEndpointBuilderFactory.java |   2 +-
 ...netesCustomResourcesEndpointBuilderFactory.java |   2 +-
 ...ubernetesDeploymentsEndpointBuilderFactory.java |   2 +-
 .../KubernetesEventsEndpointBuilderFactory.java    |   2 +-
 .../dsl/KubernetesHPAEndpointBuilderFactory.java   |   2 +-
 .../dsl/KubernetesJobEndpointBuilderFactory.java   |   2 +-
 ...KubernetesNamespacesEndpointBuilderFactory.java |   2 +-
 .../dsl/KubernetesNodesEndpointBuilderFactory.java |   2 +-
 ...sistentVolumesClaimsEndpointBuilderFactory.java |   2 +-
 ...tesPersistentVolumesEndpointBuilderFactory.java |   2 +-
 .../dsl/KubernetesPodsEndpointBuilderFactory.java  |   2 +-
 ...plicationControllersEndpointBuilderFactory.java |   2 +-
 ...rnetesResourcesQuotaEndpointBuilderFactory.java |   2 +-
 .../KubernetesSecretsEndpointBuilderFactory.java   |   2 +-
 ...netesServiceAccountsEndpointBuilderFactory.java |   2 +-
 .../KubernetesServicesEndpointBuilderFactory.java  |   2 +-
 .../endpoint/dsl/KuduEndpointBuilderFactory.java   |   2 +-
 .../dsl/Lambda2EndpointBuilderFactory.java         |   2 +-
 .../dsl/LanguageEndpointBuilderFactory.java        |   2 +-
 .../endpoint/dsl/LdapEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/LdifEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/LogEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/LuceneEndpointBuilderFactory.java |   2 +-
 .../dsl/LumberjackEndpointBuilderFactory.java      |   2 +-
 .../endpoint/dsl/MQ2EndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/MSK2EndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/MailEndpointBuilderFactory.java   |   2 +-
 .../dsl/MapstructEndpointBuilderFactory.java       |   2 +-
 .../endpoint/dsl/MasterEndpointBuilderFactory.java |   2 +-
 .../dsl/MetricsEndpointBuilderFactory.java         |   2 +-
 .../MicroProfileMetricsEndpointBuilderFactory.java |   2 +-
 .../dsl/MicrometerEndpointBuilderFactory.java      |   2 +-
 .../dsl/MiloBrowseEndpointBuilderFactory.java      |   2 +-
 .../dsl/MiloClientEndpointBuilderFactory.java      |   2 +-
 .../dsl/MiloServerEndpointBuilderFactory.java      |   2 +-
 .../endpoint/dsl/MinaEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/MinioEndpointBuilderFactory.java  |   2 +-
 .../endpoint/dsl/MllpEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/MockEndpointBuilderFactory.java   |   2 +-
 .../dsl/MongoDbEndpointBuilderFactory.java         |   2 +-
 .../dsl/MustacheEndpointBuilderFactory.java        |   2 +-
 .../endpoint/dsl/MvelEndpointBuilderFactory.java   |   2 +-
 .../dsl/MyBatisBeanEndpointBuilderFactory.java     |   2 +-
 .../dsl/MyBatisEndpointBuilderFactory.java         |   2 +-
 .../endpoint/dsl/NatsEndpointBuilderFactory.java   |   2 +-
 .../dsl/NetWeaverEndpointBuilderFactory.java       |   2 +-
 .../endpoint/dsl/NettyEndpointBuilderFactory.java  |   2 +-
 .../dsl/NettyHttpEndpointBuilderFactory.java       |   2 +-
 .../dsl/NeutronEndpointBuilderFactory.java         |   2 +-
 .../dsl/NitriteEndpointBuilderFactory.java         |   2 +-
 .../endpoint/dsl/NovaEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/OAIPMHEndpointBuilderFactory.java |   2 +-
 .../endpoint/dsl/OBSEndpointBuilderFactory.java    |   2 +-
 .../dsl/Olingo2EndpointBuilderFactory.java         |   2 +-
 .../dsl/Olingo4EndpointBuilderFactory.java         |   2 +-
 ...penshiftBuildConfigsEndpointBuilderFactory.java |   2 +-
 .../dsl/OpenshiftBuildsEndpointBuilderFactory.java |   2 +-
 ...iftDeploymentConfigsEndpointBuilderFactory.java |   2 +-
 .../dsl/OptaPlannerEndpointBuilderFactory.java     |   2 +-
 .../endpoint/dsl/PahoEndpointBuilderFactory.java   |   2 +-
 .../dsl/PahoMqtt5EndpointBuilderFactory.java       |   2 +-
 .../endpoint/dsl/PdfEndpointBuilderFactory.java    |   2 +-
 .../dsl/PgEventEndpointBuilderFactory.java         |   2 +-
 .../PgReplicationSlotEndpointBuilderFactory.java   |   2 +-
 .../dsl/PlatformHttpEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/Plc4XEndpointBuilderFactory.java  |   2 +-
 .../dsl/PrinterEndpointBuilderFactory.java         |   2 +-
 .../endpoint/dsl/PubNubEndpointBuilderFactory.java |   2 +-
 .../endpoint/dsl/PulsarEndpointBuilderFactory.java |   2 +-
 .../endpoint/dsl/QuartzEndpointBuilderFactory.java |   2 +-
 .../endpoint/dsl/QueueEndpointBuilderFactory.java  |   2 +-
 .../dsl/QuickfixjEndpointBuilderFactory.java       |   2 +-
 .../dsl/RabbitMQEndpointBuilderFactory.java        |   2 +-
 .../dsl/ReactiveStreamsEndpointBuilderFactory.java |   2 +-
 .../endpoint/dsl/RedisEndpointBuilderFactory.java  |   2 +-
 .../endpoint/dsl/RefEndpointBuilderFactory.java    |   2 +-
 .../dsl/RestApiEndpointBuilderFactory.java         |   2 +-
 .../endpoint/dsl/RestEndpointBuilderFactory.java   |   2 +-
 .../dsl/RestOpenApiEndpointBuilderFactory.java     |   2 +-
 .../dsl/RestSwaggerEndpointBuilderFactory.java     |   2 +-
 .../dsl/ResteasyEndpointBuilderFactory.java        |   2 +-
 .../dsl/RobotFrameworkEndpointBuilderFactory.java  |   2 +-
 .../endpoint/dsl/RssEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/STS2EndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/SagaEndpointBuilderFactory.java   |   2 +-
 .../dsl/SalesforceEndpointBuilderFactory.java      |   2 +-
 .../dsl/SchedulerEndpointBuilderFactory.java       |   2 +-
 .../dsl/SchematronEndpointBuilderFactory.java      |   2 +-
 .../endpoint/dsl/ScpEndpointBuilderFactory.java    |   2 +-
 .../dsl/SecretsManagerEndpointBuilderFactory.java  |   2 +-
 .../endpoint/dsl/SedaEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/ServerEndpointBuilderFactory.java |   2 +-
 .../dsl/ServiceBusEndpointBuilderFactory.java      |   2 +-
 .../dsl/ServiceEndpointBuilderFactory.java         |   2 +-
 .../dsl/ServiceNowEndpointBuilderFactory.java      |   2 +-
 .../dsl/ServletEndpointBuilderFactory.java         |   2 +-
 .../endpoint/dsl/Ses2EndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/SftpEndpointBuilderFactory.java   |   2 +-
 .../SimpleNotificationEndpointBuilderFactory.java  |   2 +-
 .../endpoint/dsl/Sjms2EndpointBuilderFactory.java  |   2 +-
 .../endpoint/dsl/SjmsEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/SlackEndpointBuilderFactory.java  |   2 +-
 .../endpoint/dsl/SmppEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/SnmpEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/Sns2EndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/SolrEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/SparkEndpointBuilderFactory.java  |   2 +-
 .../endpoint/dsl/SplunkEndpointBuilderFactory.java |   2 +-
 .../dsl/SplunkHECEndpointBuilderFactory.java       |   2 +-
 .../dsl/SpringBatchEndpointBuilderFactory.java     |   2 +-
 .../SpringIntegrationEndpointBuilderFactory.java   |   2 +-
 .../dsl/SpringJdbcEndpointBuilderFactory.java      |   2 +-
 .../dsl/SpringLdapEndpointBuilderFactory.java      |   2 +-
 .../dsl/SpringRabbitMQEndpointBuilderFactory.java  |   2 +-
 .../SpringWebserviceEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/SqlEndpointBuilderFactory.java    |   2 +-
 .../dsl/SqlStoredEndpointBuilderFactory.java       |   2 +-
 .../endpoint/dsl/Sqs2EndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/SshEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/StAXEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/StitchEndpointBuilderFactory.java |   2 +-
 .../endpoint/dsl/StompEndpointBuilderFactory.java  |   2 +-
 .../endpoint/dsl/StreamEndpointBuilderFactory.java |   2 +-
 .../dsl/StringTemplateEndpointBuilderFactory.java  |   2 +-
 .../endpoint/dsl/StubEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/SwiftEndpointBuilderFactory.java  |   2 +-
 .../dsl/TelegramEndpointBuilderFactory.java        |   2 +-
 .../endpoint/dsl/ThriftEndpointBuilderFactory.java |   2 +-
 .../endpoint/dsl/TikaEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/TimerEndpointBuilderFactory.java  |   2 +-
 .../dsl/Translate2EndpointBuilderFactory.java      |   2 +-
 .../endpoint/dsl/TwilioEndpointBuilderFactory.java |   2 +-
 ...TwitterDirectMessageEndpointBuilderFactory.java |   2 +-
 .../dsl/TwitterSearchEndpointBuilderFactory.java   |   2 +-
 .../dsl/TwitterTimelineEndpointBuilderFactory.java |   2 +-
 .../dsl/UndertowEndpointBuilderFactory.java        |   2 +-
 .../dsl/ValidatorEndpointBuilderFactory.java       |   2 +-
 .../dsl/VelocityEndpointBuilderFactory.java        |   2 +-
 .../endpoint/dsl/VertxEndpointBuilderFactory.java  |   2 +-
 .../dsl/VertxHttpEndpointBuilderFactory.java       |   2 +-
 .../dsl/VertxKafkaEndpointBuilderFactory.java      |   2 +-
 .../dsl/VertxWebsocketEndpointBuilderFactory.java  |   2 +-
 .../endpoint/dsl/VmEndpointBuilderFactory.java     |   2 +-
 .../dsl/WeatherEndpointBuilderFactory.java         |   2 +-
 .../endpoint/dsl/Web3jEndpointBuilderFactory.java  |   2 +-
 .../dsl/WebhookEndpointBuilderFactory.java         |   2 +-
 .../dsl/WebsocketEndpointBuilderFactory.java       |   2 +-
 .../endpoint/dsl/WekaEndpointBuilderFactory.java   |   2 +-
 .../dsl/WhatsAppEndpointBuilderFactory.java        |   2 +-
 .../dsl/WordpressEndpointBuilderFactory.java       |   2 +-
 .../dsl/WorkdayEndpointBuilderFactory.java         |   2 +-
 .../dsl/XChangeEndpointBuilderFactory.java         |   2 +-
 .../endpoint/dsl/XJEndpointBuilderFactory.java     |   2 +-
 .../endpoint/dsl/XQueryEndpointBuilderFactory.java |   2 +-
 .../dsl/XmlSignerEndpointBuilderFactory.java       |   2 +-
 .../dsl/XmlVerifierEndpointBuilderFactory.java     |   2 +-
 .../endpoint/dsl/XmppEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/XsltEndpointBuilderFactory.java   |   2 +-
 .../dsl/XsltSaxonEndpointBuilderFactory.java       |   2 +-
 .../dsl/ZendeskEndpointBuilderFactory.java         |   2 +-
 .../dsl/ZooKeeperEndpointBuilderFactory.java       |   2 +-
 .../dsl/ZooKeeperMasterEndpointBuilderFactory.java |   2 +-
 .../camel/maven/packaging/EndpointDslMojo.java     |   2 +-
 .../ComponentDslBuilderFactoryGenerator.java       |   2 +-
 .../ComponentsBuilderFactoryGenerator.java         |   2 +-
 .../ComponentDslBuilderFactoryGeneratorTest.java   |   2 +-
 .../openapi/RestDslSourceCodeGenerator.java        |   2 +-
 .../SpringBootProjectSourceCodeGenerator.java      |   2 +-
 .../src/test/resources/MyRestRoute.txt             |   2 +-
 .../src/test/resources/MyRestRouteFilter.txt       |   2 +-
 .../src/test/resources/MyRestRouteFilterV3.txt     |   2 +-
 .../src/test/resources/MyRestRouteV3.txt           |   2 +-
 .../src/test/resources/OpenApiPetstore.txt         |   2 +-
 .../resources/OpenApiPetstoreWithRestComponent.txt |   2 +-
 .../src/test/resources/OpenApiV3Petstore.txt       |   2 +-
 .../OpenApiV3PetstoreWithRestComponent.txt         |   2 +-
 .../test/resources/SpringBootRestController.txt    |   2 +-
 .../swagger/RestDslSourceCodeGenerator.java        |   2 +-
 .../SpringBootProjectSourceCodeGenerator.java      |   2 +-
 .../src/test/resources/MyRestRoute.txt             |   2 +-
 .../src/test/resources/MyRestRouteFilter.txt       |   2 +-
 .../test/resources/SpringBootRestController.txt    |   2 +-
 .../src/test/resources/SwaggerPetstore.txt         |   2 +-
 .../resources/SwaggerPetstoreWithRestComponent.txt |   2 +-
 750 files changed, 1183 insertions(+), 750 deletions(-)

diff --git a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/xyz/LineItem.java b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/xyz/LineItem.java
index b0b04b6ad98..2c62d5e1331 100644
--- a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/xyz/LineItem.java
+++ b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/xyz/LineItem.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.dozer.example.xyz;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/xyz/XYZOrder.java b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/xyz/XYZOrder.java
index 55dd9567986..ba77e5eab0f 100644
--- a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/xyz/XYZOrder.java
+++ b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/xyz/XYZOrder.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.dozer.example.xyz;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-picklist.vm b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-picklist.vm
index 9ef6458763f..5c33b0b03bc 100644
--- a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-picklist.vm
+++ b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-picklist.vm
@@ -20,7 +20,7 @@
  */
 package $packageName;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo-optional.vm b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo-optional.vm
index f0d166c62e8..1954a78ead5 100644
--- a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo-optional.vm
+++ b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo-optional.vm
@@ -22,7 +22,7 @@ package $packageName;
 
 import java.util.Optional;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 #set ( $hasPicklists = $utility.hasPicklists($desc) )
 #set ( $hasMultiSelectPicklists = $utility.hasMultiSelectPicklists($desc) )
diff --git a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo.vm b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo.vm
index 05927319901..c5e0dfdcffc 100644
--- a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo.vm
+++ b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-pojo.vm
@@ -23,7 +23,7 @@ package $packageName;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 #set ( $hasPicklists = $utility.hasPicklists($desc) )
 #set ( $hasMultiSelectPicklists = $utility.hasMultiSelectPicklists($desc) )
diff --git a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records-optional.vm b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records-optional.vm
index aa468b98704..47d76d5336e 100644
--- a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records-optional.vm
+++ b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records-optional.vm
@@ -23,7 +23,7 @@ package $packageName;
 import org.apache.camel.component.salesforce.api.dto.AbstractQueryRecordsBase;
 
 import java.util.List;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 /**
  * Salesforce QueryRecords DTO for type $desc.Name
diff --git a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records.vm b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records.vm
index 747e73eb1fc..26cf83fb265 100644
--- a/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records.vm
+++ b/components/camel-salesforce/camel-salesforce-codegen/src/main/resources/sobject-query-records.vm
@@ -23,7 +23,7 @@ package $packageName;
 import org.apache.camel.component.salesforce.api.dto.AbstractQueryRecordsBase;
 
 import java.util.List;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 /**
  * Salesforce QueryRecords DTO for type $desc.Name
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/RecordType.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/RecordType.java
index 0292f6c7114..08c7a79ba39 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/RecordType.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/dto/generated/RecordType.java
@@ -6,7 +6,7 @@ package org.apache.camel.component.salesforce.dto.generated;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase;
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-picklist.vm b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-picklist.vm
index 9ef6458763f..5c33b0b03bc 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-picklist.vm
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-picklist.vm
@@ -20,7 +20,7 @@
  */
 package $packageName;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo-optional.vm b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo-optional.vm
index f0d166c62e8..1954a78ead5 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo-optional.vm
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo-optional.vm
@@ -22,7 +22,7 @@ package $packageName;
 
 import java.util.Optional;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 #set ( $hasPicklists = $utility.hasPicklists($desc) )
 #set ( $hasMultiSelectPicklists = $utility.hasMultiSelectPicklists($desc) )
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo.vm b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo.vm
index 05927319901..c5e0dfdcffc 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo.vm
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-pojo.vm
@@ -23,7 +23,7 @@ package $packageName;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 #set ( $hasPicklists = $utility.hasPicklists($desc) )
 #set ( $hasMultiSelectPicklists = $utility.hasMultiSelectPicklists($desc) )
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-query-records-optional.vm b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-query-records-optional.vm
index 53bb8e27e0d..e7801f245cb 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-query-records-optional.vm
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-query-records-optional.vm
@@ -23,7 +23,7 @@ package $packageName;
 import org.apache.camel.component.salesforce.api.dto.AbstractQueryRecordsBase;
 
 import java.util.List;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 /**
  * Salesforce QueryRecords DTO for type $desc.Name
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-query-records.vm b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-query-records.vm
index e7e87ad47c3..43910a6570d 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-query-records.vm
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/resources/sobject-query-records.vm
@@ -23,7 +23,7 @@ package $packageName;
 import org.apache.camel.component.salesforce.api.dto.AbstractQueryRecordsBase;
 
 import java.util.List;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 /**
  * Salesforce QueryRecords DTO for type $desc.Name
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Asset.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Asset.java
index 792160c9f6a..52fb06caaf2 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Asset.java
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Asset.java
@@ -6,7 +6,7 @@ package $packageName;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 import org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase;
 import org.apache.camel.component.salesforce.api.dto.Attributes;
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Asset_LocalDateTime.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Asset_LocalDateTime.java
index ac13bfb0d02..303c9d1414f 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Asset_LocalDateTime.java
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Asset_LocalDateTime.java
@@ -6,7 +6,7 @@ package $packageName;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 import org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase;
 import org.apache.camel.component.salesforce.api.dto.Attributes;
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case.java
index 38040ae8548..b7c6b481b57 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case.java
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case.java
@@ -6,7 +6,7 @@ package $packageName;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 import org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase;
 import org.apache.camel.component.salesforce.api.dto.Attributes;
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListAccentMarkEnum.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListAccentMarkEnum.java
index 3d1f033bce3..9274b190e6b 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListAccentMarkEnum.java
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListAccentMarkEnum.java
@@ -3,7 +3,7 @@
  */
 package $packageName;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListQuotationMarkEnum.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListQuotationMarkEnum.java
index 06be2be36b2..12aa145848e 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListQuotationMarkEnum.java
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListQuotationMarkEnum.java
@@ -3,7 +3,7 @@
  */
 package $packageName;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListSlashEnum.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListSlashEnum.java
index bf0e09bfb3b..bc4a97394c3 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListSlashEnum.java
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListSlashEnum.java
@@ -3,7 +3,7 @@
  */
 package $packageName;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListValueOverrideEnum.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListValueOverrideEnum.java
index a034ee64872..70989bc890e 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListValueOverrideEnum.java
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/Case_PickListValueOverrideEnum.java
@@ -3,7 +3,7 @@
  */
 package $packageName;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/ComplexCalculatedFormula.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/ComplexCalculatedFormula.java
index ce0414e4d6d..32c47134217 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/ComplexCalculatedFormula.java
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/ComplexCalculatedFormula.java
@@ -6,7 +6,7 @@ package $packageName;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 import org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase;
 import org.apache.camel.component.salesforce.api.dto.Attributes;
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/QueryRecordsCase.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/QueryRecordsCase.java
index 8daa5ab2c2f..f7169b0f587 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/QueryRecordsCase.java
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/QueryRecordsCase.java
@@ -6,7 +6,7 @@ package $packageName;
 import org.apache.camel.component.salesforce.api.dto.AbstractQueryRecordsBase;
 
 import java.util.List;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 /**
  * Salesforce QueryRecords DTO for type Case
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/QueryRecordsComplexCalculatedFormula.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/QueryRecordsComplexCalculatedFormula.java
index b6d4d7c5565..9294413c0a6 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/QueryRecordsComplexCalculatedFormula.java
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/QueryRecordsComplexCalculatedFormula.java
@@ -6,7 +6,7 @@ package $packageName;
 import org.apache.camel.component.salesforce.api.dto.AbstractQueryRecordsBase;
 
 import java.util.List;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 /**
  * Salesforce QueryRecords DTO for type ComplexCalculatedFormula
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/With_External_Id__c_Lookup.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/With_External_Id__c_Lookup.java
index 698db7bfabc..614761742da 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/With_External_Id__c_Lookup.java
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/With_External_Id__c_Lookup.java
@@ -3,7 +3,7 @@
  */
 package $packageName;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/With_Reference__c.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/With_Reference__c.java
index 735bda2083a..c51163feeea 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/With_Reference__c.java
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/resources/generated/With_Reference__c.java
@@ -6,7 +6,7 @@ package $packageName;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 import org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase;
 import org.apache.camel.component.salesforce.api.dto.Attributes;
diff --git a/components/camel-servicenow/camel-servicenow-maven-plugin/src/main/java/org/apache/camel/maven/CamelServiceNowGenerateMojo.java b/components/camel-servicenow/camel-servicenow-maven-plugin/src/main/java/org/apache/camel/maven/CamelServiceNowGenerateMojo.java
index 72251f1ae27..51c892f1eab 100644
--- a/components/camel-servicenow/camel-servicenow-maven-plugin/src/main/java/org/apache/camel/maven/CamelServiceNowGenerateMojo.java
+++ b/components/camel-servicenow/camel-servicenow-maven-plugin/src/main/java/org/apache/camel/maven/CamelServiceNowGenerateMojo.java
@@ -29,7 +29,7 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import javax.lang.model.element.Modifier;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Calculator.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Calculator.java
index 7b21de8e611..79aec0fcfbc 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Calculator.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Calculator.java
@@ -23,7 +23,7 @@
 package org.apache.camel.component.thrift.generated;
 
 @SuppressWarnings({ "cast", "rawtypes", "serial", "unchecked", "unused" })
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-06-14")
+@javax.annotation.processing.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-06-14")
 public class Calculator {
 
     /**
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/InvalidOperation.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/InvalidOperation.java
index 0bc351cb6b8..d674a02d438 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/InvalidOperation.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/InvalidOperation.java
@@ -26,7 +26,7 @@ package org.apache.camel.component.thrift.generated;
 /**
  * Structs can also be exceptions, if they are nasty.
  */
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-06-14")
+@javax.annotation.processing.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-06-14")
 public class InvalidOperation extends org.apache.thrift.TException
         implements org.apache.thrift.TBase<InvalidOperation, InvalidOperation._Fields>, java.io.Serializable, Cloneable,
         Comparable<InvalidOperation> {
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Work.java b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Work.java
index 1fa0353a71f..543be4949eb 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Work.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/component/thrift/generated/Work.java
@@ -30,7 +30,7 @@ package org.apache.camel.component.thrift.generated;
  * Fields can be declared "optional", which ensures they will not be included in the serialized output if they aren't
  * set. Note that this requires some manual management in some languages.
  */
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-06-14")
+@javax.annotation.processing.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-06-14")
 public class Work implements org.apache.thrift.TBase<Work, Work._Fields>, java.io.Serializable, Cloneable, Comparable<Work> {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Work");
 
diff --git a/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/generated/Work.java b/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/generated/Work.java
index 4ab66e61000..01b12f381b9 100644
--- a/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/generated/Work.java
+++ b/components/camel-thrift/src/test/java/org/apache/camel/dataformat/thrift/generated/Work.java
@@ -30,7 +30,7 @@ package org.apache.camel.dataformat.thrift.generated;
  * Fields can be declared "optional", which ensures they will not be included in the serialized output if they aren't
  * set. Note that this requires some manual management in some languages.
  */
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-06-14")
+@javax.annotation.processing.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)", date = "2017-06-14")
 public class Work implements org.apache.thrift.TBase<Work, Work._Fields>, java.io.Serializable, Cloneable, Comparable<Work> {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Work");
 
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DynamicRouterComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DynamicRouterComponentBuilderFactory.java
index f74fe83435a..9fe16dff157 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DynamicRouterComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DynamicRouterComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DynamicRouterEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DynamicRouterEndpointBuilderFactory.java
index 0c3971749de..27265fd968c 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DynamicRouterEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DynamicRouterEndpointBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
diff --git a/docs/components/modules/ROOT/examples/components/camel-test/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsAndSkipJUnit4Test.java b/docs/components/modules/ROOT/examples/components/camel-test/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsAndSkipJUnit4Test.java
deleted file mode 120000
index bfb92faf5c3..00000000000
--- a/docs/components/modules/ROOT/examples/components/camel-test/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsAndSkipJUnit4Test.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../../../../../../../../../components/camel-test/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsAndSkipJUnit4Test.java
\ No newline at end of file
diff --git a/docs/components/modules/ROOT/examples/components/camel-test/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsAndSkipJUnit4Test.java b/docs/components/modules/ROOT/examples/components/camel-test/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsAndSkipJUnit4Test.java
new file mode 100644
index 00000000000..da82ca07a7c
--- /dev/null
+++ b/docs/components/modules/ROOT/examples/components/camel-test/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsAndSkipJUnit4Test.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.test.patterns;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.seda.SedaEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+// START SNIPPET: e1
+// tag::e1[]
+public class IsMockEndpointsAndSkipJUnit4Test extends CamelTestSupport {
+
+    @Override
+    public String isMockEndpointsAndSkip() {
+        // override this method and return the pattern for which endpoints to mock,
+        // and skip sending to the original endpoint.
+        return "direct:foo";
+    }
+
+    @Test
+    public void testMockEndpointAndSkip() throws Exception {
+        // notice we have automatic mocked the direct:foo endpoints and the name of the endpoints is "mock:uri"
+        getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
+        getMockEndpoint("mock:direct:foo").expectedMessageCount(1);
+
+        template.sendBody("direct:start", "Hello World");
+
+        assertMockEndpointsSatisfied();
+
+        // the message was not send to the direct:foo route and thus not sent to the seda endpoint
+        SedaEndpoint seda = context.getEndpoint("seda:foo", SedaEndpoint.class);
+        assertEquals(0, seda.getCurrentQueueSize());
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start").to("direct:foo").to("mock:result");
+
+                from("direct:foo").transform(constant("Bye World")).to("seda:foo");
+            }
+        };
+    }
+}
+// end::e1[]
+// END SNIPPET: e1
diff --git a/docs/components/modules/ROOT/examples/components/camel-test/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsJUnit4Test.java b/docs/components/modules/ROOT/examples/components/camel-test/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsJUnit4Test.java
deleted file mode 120000
index 76794ea47da..00000000000
--- a/docs/components/modules/ROOT/examples/components/camel-test/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsJUnit4Test.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../../../../../../../../../components/camel-test/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsJUnit4Test.java
\ No newline at end of file
diff --git a/docs/components/modules/ROOT/examples/components/camel-test/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsJUnit4Test.java b/docs/components/modules/ROOT/examples/components/camel-test/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsJUnit4Test.java
new file mode 100644
index 00000000000..d8cf4c04813
--- /dev/null
+++ b/docs/components/modules/ROOT/examples/components/camel-test/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsJUnit4Test.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.test.patterns;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+// START SNIPPET: e1
+// tag::e1[]
+public class IsMockEndpointsJUnit4Test extends CamelTestSupport {
+
+    @Override
+    public String isMockEndpoints() {
+        // override this method and return the pattern for which endpoints to mock.
+        // use * to indicate all
+        return "*";
+    }
+
+    @Test
+    public void testMockAllEndpoints() throws Exception {
+        // notice we have automatic mocked all endpoints and the name of the endpoints is "mock:uri"
+        getMockEndpoint("mock:direct:start").expectedBodiesReceived("Hello World");
+        getMockEndpoint("mock:direct:foo").expectedBodiesReceived("Hello World");
+        getMockEndpoint("mock:log:foo").expectedBodiesReceived("Bye World");
+        getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
+
+        template.sendBody("direct:start", "Hello World");
+
+        assertMockEndpointsSatisfied();
+
+        // additional test to ensure correct endpoints in registry
+        assertNotNull(context.hasEndpoint("direct:start"));
+        assertNotNull(context.hasEndpoint("direct:foo"));
+        assertNotNull(context.hasEndpoint("log:foo"));
+        assertNotNull(context.hasEndpoint("mock:result"));
+        // all the endpoints was mocked
+        assertNotNull(context.hasEndpoint("mock:direct:start"));
+        assertNotNull(context.hasEndpoint("mock:direct:foo"));
+        assertNotNull(context.hasEndpoint("mock:log:foo"));
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start").to("direct:foo").to("log:foo").to("mock:result");
+
+                from("direct:foo").transform(constant("Bye World"));
+            }
+        };
+    }
+}
+// end::e1[]
+// END SNIPPET: e1
diff --git a/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockEndpointsTest.java b/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockEndpointsTest.java
deleted file mode 120000
index d8175f9a786..00000000000
--- a/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockEndpointsTest.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../../../../../../../../core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockEndpointsTest.java
\ No newline at end of file
diff --git a/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockEndpointsTest.java b/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockEndpointsTest.java
new file mode 100644
index 00000000000..9196ca983f8
--- /dev/null
+++ b/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockEndpointsTest.java
@@ -0,0 +1,119 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor.interceptor;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.AdviceWith;
+import org.apache.camel.builder.RouteBuilder;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+public class AdviceWithMockEndpointsTest extends ContextTestSupport {
+
+    @Test
+    public void testNoAdvised() throws Exception {
+        getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
+
+        template.sendBody("direct:start", "Hello World");
+
+        assertMockEndpointsSatisfied();
+    }
+
+    // START SNIPPET: e1
+    // tag::e1[]
+    @Test
+    public void testAdvisedMockEndpoints() throws Exception {
+        // advice the start route using the inlined AdviceWith lambda style route builder
+        // which has extended capabilities than the regular route builder
+        AdviceWith.adviceWith(context, "start", a ->
+        // mock all endpoints
+        a.mockEndpoints());
+
+        getMockEndpoint("mock:direct:start").expectedBodiesReceived("Hello World");
+        getMockEndpoint("mock:direct:foo").expectedBodiesReceived("Hello World");
+        getMockEndpoint("mock:log:foo").expectedBodiesReceived("Bye World");
+        getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
+
+        template.sendBody("direct:start", "Hello World");
+
+        assertMockEndpointsSatisfied();
+
+        // additional test to ensure correct endpoints in registry
+        assertNotNull(context.hasEndpoint("direct:start"));
+        assertNotNull(context.hasEndpoint("direct:foo"));
+        assertNotNull(context.hasEndpoint("log:foo"));
+        assertNotNull(context.hasEndpoint("mock:result"));
+        // all the endpoints was mocked
+        assertNotNull(context.hasEndpoint("mock:direct:start"));
+        assertNotNull(context.hasEndpoint("mock:direct:foo"));
+        assertNotNull(context.hasEndpoint("mock:log:foo"));
+    }
+    // end::e1[]
+    // END SNIPPET: e1
+
+    // START SNIPPET: e2
+    // tag::e2[]
+    @Test
+    public void testAdvisedMockEndpointsWithPattern() throws Exception {
+        // advice the start route using the inlined AdviceWith lambda style route builder
+        // which has extended capabilities than the regular route builder
+        AdviceWith.adviceWith(context, "start", a ->
+        // mock only log endpoints
+        a.mockEndpoints("log*"));
+
+        // now we can refer to log:foo as a mock and set our expectations
+        getMockEndpoint("mock:log:foo").expectedBodiesReceived("Bye World");
+
+        getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
+
+        template.sendBody("direct:start", "Hello World");
+
+        assertMockEndpointsSatisfied();
+
+        // additional test to ensure correct endpoints in registry
+        assertNotNull(context.hasEndpoint("direct:start"));
+        assertNotNull(context.hasEndpoint("direct:foo"));
+        assertNotNull(context.hasEndpoint("log:foo"));
+        assertNotNull(context.hasEndpoint("mock:result"));
+        // only the log:foo endpoint was mocked
+        assertNotNull(context.hasEndpoint("mock:log:foo"));
+        assertNull(context.hasEndpoint("mock:direct:start"));
+        assertNull(context.hasEndpoint("mock:direct:foo"));
+    }
+    // end::e2[]
+    // END SNIPPET: e2
+
+    // START SNIPPET: route
+    // tag::route[]
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start").routeId("start")
+                        .to("direct:foo").to("log:foo").to("mock:result");
+
+                from("direct:foo").routeId("foo")
+                        .transform(constant("Bye World"));
+            }
+        };
+    }
+    // end::route[]
+    // END SNIPPET: route
+}
diff --git a/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockMultipleEndpointsWithSkipTest.java b/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockMultipleEndpointsWithSkipTest.java
deleted file mode 120000
index cc256d73758..00000000000
--- a/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockMultipleEndpointsWithSkipTest.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../../../../../../../../core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockMultipleEndpointsWithSkipTest.java
\ No newline at end of file
diff --git a/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockMultipleEndpointsWithSkipTest.java b/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockMultipleEndpointsWithSkipTest.java
new file mode 100644
index 00000000000..c37f83e6d35
--- /dev/null
+++ b/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockMultipleEndpointsWithSkipTest.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor.interceptor;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.AdviceWith;
+import org.apache.camel.builder.AdviceWithRouteBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.seda.SedaEndpoint;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class AdviceWithMockMultipleEndpointsWithSkipTest extends ContextTestSupport {
+
+    // START SNIPPET: e1
+    // tag::e1[]
+    @Test
+    public void testAdvisedMockEndpointsWithSkip() throws Exception {
+        // advice the first route using the inlined AdviceWith route builder
+        // which has extended capabilities than the regular route builder
+        AdviceWith.adviceWith(context.getRouteDefinitions().get(0), context, new AdviceWithRouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                // mock sending to direct:foo and direct:bar and skip send to it
+                mockEndpointsAndSkip("direct:foo", "direct:bar");
+            }
+        });
+
+        getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
+        getMockEndpoint("mock:direct:foo").expectedMessageCount(1);
+        getMockEndpoint("mock:direct:bar").expectedMessageCount(1);
+
+        template.sendBody("direct:start", "Hello World");
+
+        assertMockEndpointsSatisfied();
+
+        // the message was not send to the direct:foo route and thus not sent to
+        // the seda endpoint
+        SedaEndpoint seda = context.getEndpoint("seda:foo", SedaEndpoint.class);
+        assertEquals(0, seda.getCurrentQueueSize());
+    }
+    // end::e1[]
+    // END SNIPPET: e1
+
+    // START SNIPPET: route
+    // tag::route[]
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start").to("direct:foo").to("direct:bar").to("mock:result");
+
+                from("direct:foo").transform(constant("Bye World")).to("seda:foo");
+                from("direct:bar").transform(constant("Hi World")).to("seda:foo");
+            }
+        };
+    }
+    // end::route[]
+    // END SNIPPET: route
+}
diff --git a/docs/user-manual/modules/faq/examples/core/camel-management/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java b/docs/user-manual/modules/faq/examples/core/camel-management/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java
deleted file mode 120000
index e976af7636f..00000000000
--- a/docs/user-manual/modules/faq/examples/core/camel-management/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../../../../../../../core/camel-management/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java
\ No newline at end of file
diff --git a/docs/user-manual/modules/faq/examples/core/camel-management/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java b/docs/user-manual/modules/faq/examples/core/camel-management/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java
new file mode 100644
index 00000000000..d3aba6b66de
--- /dev/null
+++ b/docs/user-manual/modules/faq/examples/core/camel-management/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java
@@ -0,0 +1,110 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.management;
+
+import javax.management.Attribute;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.api.management.ManagedAttribute;
+import org.apache.camel.api.management.ManagedResource;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.support.service.ServiceSupport;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
+
+import static org.apache.camel.management.DefaultManagementObjectNameStrategy.TYPE_PROCESSOR;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@DisabledOnOs(OS.AIX)
+public class ManagedCustomProcessorTest extends ManagementTestSupport {
+
+    @Test
+    public void testManageCustomProcessor() throws Exception {
+        MBeanServer mbeanServer = getMBeanServer();
+        ObjectName on = getCamelObjectName(TYPE_PROCESSOR, "custom");
+
+        getMockEndpoint("mock:result").expectedMessageCount(1);
+        getMockEndpoint("mock:result").expectedHeaderReceived("foo", "hey");
+        template.sendBody("direct:start", "Hello World");
+        assertMockEndpointsSatisfied();
+
+        String foo = (String) mbeanServer.getAttribute(on, "Foo");
+        assertEquals("hey", foo);
+
+        // change foo
+        mbeanServer.setAttribute(on, new Attribute("Foo", "changed"));
+
+        resetMocks();
+
+        getMockEndpoint("mock:result").expectedMessageCount(1);
+        getMockEndpoint("mock:result").expectedHeaderReceived("foo", "changed");
+        template.sendBody("direct:start", "Bye World");
+        assertMockEndpointsSatisfied();
+
+        String state = (String) mbeanServer.getAttribute(on, "State");
+        assertEquals("Started", state);
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start").routeId("foo")
+                        .process(new MyCustomProcessor()).id("custom")
+                        .to("mock:result");
+            }
+        };
+    }
+
+    // tag::e1[]
+    @ManagedResource(description = "My Managed Component")
+    public static class MyCustomProcessor extends ServiceSupport implements Processor {
+        private String foo = "hey";
+
+        @ManagedAttribute
+        public String getFoo() {
+            return foo;
+        }
+
+        @ManagedAttribute
+        public void setFoo(String foo) {
+            this.foo = foo;
+        }
+
+        @Override
+        public void process(Exchange exchange) throws Exception {
+            exchange.getIn().setHeader("foo", getFoo());
+        }
+
+        @Override
+        protected void doStart() throws Exception {
+            // noop
+        }
+
+        @Override
+        protected void doStop() throws Exception {
+            // noop
+        }
+    }
+    // end::e1[]
+
+}
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
index 0aae7716fbc..adc365e7896 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 /**
  * Component DSL builder.
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ActivemqComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ActivemqComponentBuilderFactory.java
index 484f57faa79..24bd5624d14 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ActivemqComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ActivemqComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AmqpComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AmqpComponentBuilderFactory.java
index 8ab27421487..ffcca35c412 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AmqpComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AmqpComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ArangodbComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ArangodbComponentBuilderFactory.java
index 03c6f0ab350..e29210a9329 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ArangodbComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ArangodbComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/As2ComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/As2ComponentBuilderFactory.java
index 3e0f590c3c3..eb5530136e0 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/As2ComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/As2ComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AsteriskComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AsteriskComponentBuilderFactory.java
index 25ba6e30aa2..5ab828b2ad3 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AsteriskComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AsteriskComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtlasmapComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtlasmapComponentBuilderFactory.java
index 41c65d046d6..71a5fafc4aa 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtlasmapComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtlasmapComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtmosComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtmosComponentBuilderFactory.java
index 9cb051daae4..f89071ab9d0 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtmosComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtmosComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtmosphereWebsocketComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtmosphereWebsocketComponentBuilderFactory.java
index 1b049fa435e..56d97065fb6 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtmosphereWebsocketComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtmosphereWebsocketComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomComponentBuilderFactory.java
index 183e18768a6..4e02c24896d 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AvroComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AvroComponentBuilderFactory.java
index f1721f204c6..3d9d4ee25cc 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AvroComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AvroComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2AthenaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2AthenaComponentBuilderFactory.java
index ddb90154e90..a255b59813a 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2AthenaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2AthenaComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2CwComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2CwComponentBuilderFactory.java
index b8de89a8f88..b66bd8ecdad 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2CwComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2CwComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2DdbComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2DdbComponentBuilderFactory.java
index 7e6e988b361..226cd2a2259 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2DdbComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2DdbComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2DdbstreamComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2DdbstreamComponentBuilderFactory.java
index 3d7eb3ac730..4073280a653 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2DdbstreamComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2DdbstreamComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2Ec2ComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2Ec2ComponentBuilderFactory.java
index 195f039bb82..d02dd82bb4b 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2Ec2ComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2Ec2ComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2EcsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2EcsComponentBuilderFactory.java
index a35ee18820d..ad6bdc9ffb4 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2EcsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2EcsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2EksComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2EksComponentBuilderFactory.java
index 45d6b9261dc..9cc564c0be3 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2EksComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2EksComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2EventbridgeComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2EventbridgeComponentBuilderFactory.java
index 3ec0e7426c4..6ec07009b87 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2EventbridgeComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2EventbridgeComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2IamComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2IamComponentBuilderFactory.java
index 25dcdfa794c..08c42a16ab9 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2IamComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2IamComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2KinesisComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2KinesisComponentBuilderFactory.java
index c6ac5e1b374..4368b9d4061 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2KinesisComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2KinesisComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2KinesisFirehoseComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2KinesisFirehoseComponentBuilderFactory.java
index 6071a7cbd48..8cffe2e177c 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2KinesisFirehoseComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2KinesisFirehoseComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2KmsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2KmsComponentBuilderFactory.java
index 4caca7f6083..1227aafbedf 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2KmsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2KmsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2LambdaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2LambdaComponentBuilderFactory.java
index 63947607144..db1c984b766 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2LambdaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2LambdaComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2MqComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2MqComponentBuilderFactory.java
index 31c718d7cd5..41687196fd5 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2MqComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2MqComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2MskComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2MskComponentBuilderFactory.java
index 70e44fa10b0..8ce11f29091 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2MskComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2MskComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2S3ComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2S3ComponentBuilderFactory.java
index 41f5b3f5b94..69abb477af7 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2S3ComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2S3ComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SesComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SesComponentBuilderFactory.java
index cb8e1184bf4..c9d56b29a28 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SesComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SesComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SnsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SnsComponentBuilderFactory.java
index 77ce9108ff9..fd425eea6d7 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SnsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SnsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SqsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SqsComponentBuilderFactory.java
index e93031f1b0c..908ce1d35e0 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SqsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2SqsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2StsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2StsComponentBuilderFactory.java
index 0f4e04c5da7..26c064f9097 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2StsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2StsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2TranslateComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2TranslateComponentBuilderFactory.java
index 8efb26a9736..17a934c2f61 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2TranslateComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2TranslateComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsCloudtrailComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsCloudtrailComponentBuilderFactory.java
index d9b11777fe3..1088cc4f57b 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsCloudtrailComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsCloudtrailComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsSecretsManagerComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsSecretsManagerComponentBuilderFactory.java
index 2ea682354c3..4ff34ec2d71 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsSecretsManagerComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsSecretsManagerComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureCosmosdbComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureCosmosdbComponentBuilderFactory.java
index 54548653ad5..ea66bd5e8ff 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureCosmosdbComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureCosmosdbComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureEventhubsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureEventhubsComponentBuilderFactory.java
index 0df070eab9f..3eeff15e1b6 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureEventhubsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureEventhubsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureKeyVaultComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureKeyVaultComponentBuilderFactory.java
index f207e6db4a5..2ac9913d897 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureKeyVaultComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureKeyVaultComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureServicebusComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureServicebusComponentBuilderFactory.java
index 91451bcbeee..5ee94295f5e 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureServicebusComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureServicebusComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureStorageBlobComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureStorageBlobComponentBuilderFactory.java
index 55a72bb2d20..a209d561b13 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureStorageBlobComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureStorageBlobComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureStorageDatalakeComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureStorageDatalakeComponentBuilderFactory.java
index 2f635598f73..2641397ca89 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureStorageDatalakeComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureStorageDatalakeComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureStorageQueueComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureStorageQueueComponentBuilderFactory.java
index ef6579a82d0..34ffd6a9597 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureStorageQueueComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureStorageQueueComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BeanComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BeanComponentBuilderFactory.java
index 6a973671a54..4dec63aa0fd 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BeanComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BeanComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BeanValidatorComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BeanValidatorComponentBuilderFactory.java
index 8002e91bc8d..0ee844e00c2 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BeanValidatorComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BeanValidatorComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BonitaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BonitaComponentBuilderFactory.java
index 237306ef35f..3e1ffc0ca02 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BonitaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BonitaComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BoxComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BoxComponentBuilderFactory.java
index 4f8928aa33e..7da6f6033e4 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BoxComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BoxComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BraintreeComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BraintreeComponentBuilderFactory.java
index 302a5b58855..dd71616cd27 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BraintreeComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BraintreeComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BrowseComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BrowseComponentBuilderFactory.java
index 7a8a2fa574b..caf78fba3fd 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BrowseComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BrowseComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CaffeineCacheComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CaffeineCacheComponentBuilderFactory.java
index a54ba6fdd0c..dde7eca84bd 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CaffeineCacheComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CaffeineCacheComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CaffeineLoadcacheComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CaffeineLoadcacheComponentBuilderFactory.java
index 1a8b2c799cd..ed15ebad9bb 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CaffeineLoadcacheComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CaffeineLoadcacheComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ChatscriptComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ChatscriptComponentBuilderFactory.java
index 0faada66fb4..07093194388 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ChatscriptComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ChatscriptComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ChunkComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ChunkComponentBuilderFactory.java
index db221371e5f..fc001f7fa8c 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ChunkComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ChunkComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ClasComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ClasComponentBuilderFactory.java
index a588756635a..08daf2dc1e5 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ClasComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ClasComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CmSmsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CmSmsComponentBuilderFactory.java
index bb750d31e81..4a254481cd0 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CmSmsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CmSmsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CmisComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CmisComponentBuilderFactory.java
index 7021a1ef812..8d2fbe189ac 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CmisComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CmisComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CoapComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CoapComponentBuilderFactory.java
index ca9b630e4a7..2f9772414ed 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CoapComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CoapComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CoapTcpComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CoapTcpComponentBuilderFactory.java
index d8baa7a31d0..388b1e867a5 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CoapTcpComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CoapTcpComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CoapsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CoapsComponentBuilderFactory.java
index 593079d8cc9..5ba0a4a013f 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CoapsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CoapsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CoapsTcpComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CoapsTcpComponentBuilderFactory.java
index 07bfedcc6de..93694019967 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CoapsTcpComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CoapsTcpComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CometdComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CometdComponentBuilderFactory.java
index cf14eca7452..d0b1db378e2 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CometdComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CometdComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CometdsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CometdsComponentBuilderFactory.java
index 8911b7e3b76..fd31cb0122e 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CometdsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CometdsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java
index 602dc5f7c24..539ef5d3d85 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ControlbusComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ControlbusComponentBuilderFactory.java
index a0b5c89f057..433009d0b6c 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ControlbusComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ControlbusComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CordaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CordaComponentBuilderFactory.java
index f8685dc3ab8..48c016e4c87 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CordaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CordaComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CouchbaseComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CouchbaseComponentBuilderFactory.java
index 56222c5dabf..1ea0ed0639f 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CouchbaseComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CouchbaseComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CouchdbComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CouchdbComponentBuilderFactory.java
index ce532d710ad..ce593d61b98 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CouchdbComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CouchdbComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CqlComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CqlComponentBuilderFactory.java
index 24c117bc2f2..47ca940f487 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CqlComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CqlComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CronComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CronComponentBuilderFactory.java
index 833acf694c2..0c593bc6d28 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CronComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CronComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CryptoComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CryptoComponentBuilderFactory.java
index 59e2b535ec4..76352935aa9 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CryptoComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CryptoComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CxfComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CxfComponentBuilderFactory.java
index 91d10a1f7d7..a65ad4832d9 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CxfComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CxfComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CxfrsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CxfrsComponentBuilderFactory.java
index 89286a3dc53..07d6a3385ea 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CxfrsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/CxfrsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DataformatComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DataformatComponentBuilderFactory.java
index 67e2c905c1e..96554785518 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DataformatComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DataformatComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DatasetComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DatasetComponentBuilderFactory.java
index e9896053acb..ed35381b4de 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DatasetComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DatasetComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DatasetTestComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DatasetTestComponentBuilderFactory.java
index 7bebe6c066a..2fa9970e6eb 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DatasetTestComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DatasetTestComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumDb2ComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumDb2ComponentBuilderFactory.java
index 6f98af301a6..4d5296685b7 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumDb2ComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumDb2ComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMongodbComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMongodbComponentBuilderFactory.java
index 35aef63623b..cc73588a87e 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMongodbComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMongodbComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMysqlComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMysqlComponentBuilderFactory.java
index 8fb610e1d59..59eec2138ee 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMysqlComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumMysqlComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumOracleComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumOracleComponentBuilderFactory.java
index fe0aa0ee5a0..0c96911f83a 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumOracleComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumOracleComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumPostgresComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumPostgresComponentBuilderFactory.java
index 53b70c64f19..3e0324093cc 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumPostgresComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumPostgresComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumSqlserverComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumSqlserverComponentBuilderFactory.java
index 1d6576cbbf8..dea9749efa7 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumSqlserverComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DebeziumSqlserverComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DigitaloceanComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DigitaloceanComponentBuilderFactory.java
index 0f8bd2a54f1..31a5f771ceb 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DigitaloceanComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DigitaloceanComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DirectComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DirectComponentBuilderFactory.java
index dd14b8dc1c9..d31cc3f12f0 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DirectComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DirectComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DirectVmComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DirectVmComponentBuilderFactory.java
index 2af488a46e4..2b520c3a522 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DirectVmComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DirectVmComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DisruptorComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DisruptorComponentBuilderFactory.java
index 786d99ef498..03a55643724 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DisruptorComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DisruptorComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DisruptorVmComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DisruptorVmComponentBuilderFactory.java
index 2d3bc2ff8f2..4062eb11c6e 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DisruptorVmComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DisruptorVmComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DjlComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DjlComponentBuilderFactory.java
index b3c357deb90..3fb5d2c59fb 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DjlComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DjlComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DnsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DnsComponentBuilderFactory.java
index f838723d603..2ef187c013a 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DnsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DnsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DockerComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DockerComponentBuilderFactory.java
index 2ccf5eb6b93..241a21b04d1 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DockerComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DockerComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DozerComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DozerComponentBuilderFactory.java
index de9165e5dac..788260fb41d 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DozerComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DozerComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DrillComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DrillComponentBuilderFactory.java
index b72989fb26d..089836ee760 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DrillComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DrillComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DropboxComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DropboxComponentBuilderFactory.java
index b4367d6b7e5..3cbc430959e 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DropboxComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DropboxComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DynamicRouterComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DynamicRouterComponentBuilderFactory.java
index 0a253b274e6..f2fbf9b142f 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DynamicRouterComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DynamicRouterComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/EhcacheComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/EhcacheComponentBuilderFactory.java
index bd5da4a2ef7..f453a147549 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/EhcacheComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/EhcacheComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ElasticsearchComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ElasticsearchComponentBuilderFactory.java
index df50af5eb70..8e37853f6c3 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ElasticsearchComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ElasticsearchComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ElasticsearchRestComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ElasticsearchRestComponentBuilderFactory.java
index daa98d6db1f..3de9a898939 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ElasticsearchRestComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ElasticsearchRestComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Etcd3ComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Etcd3ComponentBuilderFactory.java
index b1311acaee7..9c4678b51a2 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Etcd3ComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Etcd3ComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ExecComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ExecComponentBuilderFactory.java
index f75e84d49a0..be856f51de9 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ExecComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ExecComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FacebookComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FacebookComponentBuilderFactory.java
index b3fec1789e0..a3c33d84abb 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FacebookComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FacebookComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FhirComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FhirComponentBuilderFactory.java
index b6b192357a9..c68845188c4 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FhirComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FhirComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FileComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FileComponentBuilderFactory.java
index 1234bbd8948..335dfdd9744 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FileComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FileComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FileWatchComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FileWatchComponentBuilderFactory.java
index e7422542576..4815083c03a 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FileWatchComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FileWatchComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FlatpackComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FlatpackComponentBuilderFactory.java
index 70348ae95c1..e7673e709c9 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FlatpackComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FlatpackComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FlinkComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FlinkComponentBuilderFactory.java
index 16cce15f8a4..7a3d82fb4c8 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FlinkComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FlinkComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FopComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FopComponentBuilderFactory.java
index 8ee33360340..fa3f247c3ac 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FopComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FopComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FreemarkerComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FreemarkerComponentBuilderFactory.java
index db86b255343..b0560fa6c2d 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FreemarkerComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FreemarkerComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FtpComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FtpComponentBuilderFactory.java
index e7e92579a12..cd41be320c4 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FtpComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FtpComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FtpsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FtpsComponentBuilderFactory.java
index 83073b02b7c..df545e3c89e 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FtpsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/FtpsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GeocoderComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GeocoderComponentBuilderFactory.java
index 4d81b0bc148..867de7f33cf 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GeocoderComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GeocoderComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GitComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GitComponentBuilderFactory.java
index 1dd5e34a481..303960889fa 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GitComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GitComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GithubComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GithubComponentBuilderFactory.java
index 63aad92e0b7..72ef3a62c41 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GithubComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GithubComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleBigqueryComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleBigqueryComponentBuilderFactory.java
index c5ca40a8e23..8c1317a6f6f 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleBigqueryComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleBigqueryComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleBigquerySqlComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleBigquerySqlComponentBuilderFactory.java
index 51dff76feb1..90b3e456c78 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleBigquerySqlComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleBigquerySqlComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleCalendarComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleCalendarComponentBuilderFactory.java
index 3f563626975..576f9540a25 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleCalendarComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleCalendarComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleCalendarStreamComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleCalendarStreamComponentBuilderFactory.java
index 80b738c8ef2..8a0356b7e63 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleCalendarStreamComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleCalendarStreamComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleDriveComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleDriveComponentBuilderFactory.java
index 56bf57014e1..1e55feb80e7 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleDriveComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleDriveComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleFunctionsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleFunctionsComponentBuilderFactory.java
index ea436637c28..35a149d7987 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleFunctionsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleFunctionsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleMailComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleMailComponentBuilderFactory.java
index 221af7e165e..986bf30a93c 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleMailComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleMailComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleMailStreamComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleMailStreamComponentBuilderFactory.java
index 3170c87ff11..11a6a993700 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleMailStreamComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleMailStreamComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GooglePubsubComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GooglePubsubComponentBuilderFactory.java
index c3daf2e99a1..85ce4794de3 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GooglePubsubComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GooglePubsubComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSecretManagerComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSecretManagerComponentBuilderFactory.java
index 251cb85abec..f7ca24a1e26 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSecretManagerComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSecretManagerComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsComponentBuilderFactory.java
index d92b59162fc..1bb677a7d90 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsStreamComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsStreamComponentBuilderFactory.java
index 5a0b94666dd..8e690f84a62 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsStreamComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsStreamComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleStorageComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleStorageComponentBuilderFactory.java
index fa273c069c3..91222f66435 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleStorageComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleStorageComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoraComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoraComponentBuilderFactory.java
index 7c7f1151d42..ebfb08a50f1 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoraComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoraComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GrapeComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GrapeComponentBuilderFactory.java
index a16647082f5..507c584945f 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GrapeComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GrapeComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GraphqlComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GraphqlComponentBuilderFactory.java
index 7d98ae32fbb..16d8a1f07a5 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GraphqlComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GraphqlComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GrpcComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GrpcComponentBuilderFactory.java
index eaf6ff0f9e1..42703297cb1 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GrpcComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GrpcComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GuavaEventbusComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GuavaEventbusComponentBuilderFactory.java
index c5af287a95c..2c7d87281ad 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GuavaEventbusComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GuavaEventbusComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HashicorpVaultComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HashicorpVaultComponentBuilderFactory.java
index e0b8c3ebaf4..3916e19e2ac 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HashicorpVaultComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HashicorpVaultComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastAtomicvalueComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastAtomicvalueComponentBuilderFactory.java
index 257a5eeb899..47f89705fff 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastAtomicvalueComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastAtomicvalueComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastInstanceComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastInstanceComponentBuilderFactory.java
index 70849cda6e4..79ffe592e3c 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastInstanceComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastInstanceComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastListComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastListComponentBuilderFactory.java
index 502766faa4d..771b9210e98 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastListComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastListComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastMapComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastMapComponentBuilderFactory.java
index 1474da6c0e5..8c49bbd05f7 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastMapComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastMapComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastMultimapComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastMultimapComponentBuilderFactory.java
index f612f743490..d317fd509ca 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastMultimapComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastMultimapComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastQueueComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastQueueComponentBuilderFactory.java
index 11d27c46eea..12ea3f35361 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastQueueComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastQueueComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastReplicatedmapComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastReplicatedmapComponentBuilderFactory.java
index 015149b5528..f6afe26bf07 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastReplicatedmapComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastReplicatedmapComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastRingbufferComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastRingbufferComponentBuilderFactory.java
index 9c576ce772d..22780a4d55a 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastRingbufferComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastRingbufferComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastSedaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastSedaComponentBuilderFactory.java
index 32b84156ba8..a554d1ba72a 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastSedaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastSedaComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastSetComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastSetComponentBuilderFactory.java
index 9ee19d33951..e3de491c7cb 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastSetComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastSetComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastTopicComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastTopicComponentBuilderFactory.java
index ad3e8c8603c..44cbb297f38 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastTopicComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HazelcastTopicComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HbaseComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HbaseComponentBuilderFactory.java
index 10e0ef7e04e..88d2e6ce9d3 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HbaseComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HbaseComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HdfsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HdfsComponentBuilderFactory.java
index 7740dbe7f73..2e235c1a29f 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HdfsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HdfsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HttpComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HttpComponentBuilderFactory.java
index b350105110c..bed14bb65c8 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HttpComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HttpComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HttpsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HttpsComponentBuilderFactory.java
index 46fb0b32f9a..6c1ab7da13b 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HttpsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HttpsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudDmsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudDmsComponentBuilderFactory.java
index bc154450dae..627c7e074f9 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudDmsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudDmsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudFrsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudFrsComponentBuilderFactory.java
index 24761790c47..3dcb4c410c6 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudFrsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudFrsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudFunctiongraphComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudFunctiongraphComponentBuilderFactory.java
index d51350a2d02..63a372cc4b8 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudFunctiongraphComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudFunctiongraphComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.FunctionGraphComponent;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudIamComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudIamComponentBuilderFactory.java
index f961bcaa8ec..bc83883d3c4 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudIamComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudIamComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudImagerecognitionComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudImagerecognitionComponentBuilderFactory.java
index 8656d770251..df6c2eec3e4 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudImagerecognitionComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudImagerecognitionComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudObsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudObsComponentBuilderFactory.java
index 11ce640be8d..40eb5bb4cab 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudObsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudObsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudSmnComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudSmnComponentBuilderFactory.java
index a8665c4bbcc..9e0e246ac1b 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudSmnComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HwcloudSmnComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HyperledgerAriesComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HyperledgerAriesComponentBuilderFactory.java
index d2b021af5ce..f4a29dac250 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HyperledgerAriesComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/HyperledgerAriesComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Iec60870ClientComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Iec60870ClientComponentBuilderFactory.java
index a5caf271b3e..8037845b60b 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Iec60870ClientComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Iec60870ClientComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Iec60870ServerComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Iec60870ServerComponentBuilderFactory.java
index 3c12860d148..fac10dbef34 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Iec60870ServerComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Iec60870ServerComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteCacheComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteCacheComponentBuilderFactory.java
index 2dc5b025ec9..114040216e2 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteCacheComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteCacheComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteComputeComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteComputeComponentBuilderFactory.java
index 50dc356adbd..2eeb031ae89 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteComputeComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteComputeComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteEventsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteEventsComponentBuilderFactory.java
index 792938fca9d..c97987ced11 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteEventsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteEventsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteIdgenComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteIdgenComponentBuilderFactory.java
index d664e476488..e6367756f52 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteIdgenComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteIdgenComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteMessagingComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteMessagingComponentBuilderFactory.java
index 022c348650d..7e0fdb7b781 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteMessagingComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteMessagingComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteQueueComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteQueueComponentBuilderFactory.java
index f758ed2d8cc..417c9293e08 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteQueueComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteQueueComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteSetComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteSetComponentBuilderFactory.java
index 68ed37aea25..5d307c11a9b 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteSetComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IgniteSetComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ImapComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ImapComponentBuilderFactory.java
index aa75914b575..0d27d308f1b 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ImapComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ImapComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ImapsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ImapsComponentBuilderFactory.java
index 6afc924954b..e259748b7c7 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ImapsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ImapsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/InfinispanComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/InfinispanComponentBuilderFactory.java
index 843008e058f..5e79adfff86 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/InfinispanComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/InfinispanComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/InfinispanEmbeddedComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/InfinispanEmbeddedComponentBuilderFactory.java
index 376f4663da1..c13ca3bc4ca 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/InfinispanEmbeddedComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/InfinispanEmbeddedComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/InfluxdbComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/InfluxdbComponentBuilderFactory.java
index eb20a6e4021..07596293ec9 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/InfluxdbComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/InfluxdbComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IotaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IotaComponentBuilderFactory.java
index b46cb908d38..ceea7129d02 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IotaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IotaComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IpfsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IpfsComponentBuilderFactory.java
index 077b588c98c..48557792f65 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IpfsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IpfsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IrcComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IrcComponentBuilderFactory.java
index b58337a7ba3..aa76d4920bd 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IrcComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IrcComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IronmqComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IronmqComponentBuilderFactory.java
index a875f0b867b..71f0f0924d9 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IronmqComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/IronmqComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JbpmComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JbpmComponentBuilderFactory.java
index c392edbb3e3..41cbd383850 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JbpmComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JbpmComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcacheComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcacheComponentBuilderFactory.java
index def8ccb9504..2b5e0f65271 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcacheComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcacheComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcloudsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcloudsComponentBuilderFactory.java
index e9e31474086..71dd3540466 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcloudsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcloudsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcrComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcrComponentBuilderFactory.java
index c4a6a9a3219..07cee527906 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcrComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcrComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JdbcComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JdbcComponentBuilderFactory.java
index 601b359c575..e71398b5e56 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JdbcComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JdbcComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JettyComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JettyComponentBuilderFactory.java
index b5b006567cc..41ef2d79a1c 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JettyComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JettyComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JgroupsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JgroupsComponentBuilderFactory.java
index 6f32da942c5..f3a2b2a1937 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JgroupsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JgroupsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JgroupsRaftComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JgroupsRaftComponentBuilderFactory.java
index 93c0e9141a5..259603943c2 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JgroupsRaftComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JgroupsRaftComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JiraComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JiraComponentBuilderFactory.java
index 1012df56e70..accdffd3091 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JiraComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JiraComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JmsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JmsComponentBuilderFactory.java
index 66b39d212da..ff12ca16b20 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JmsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JmsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JmxComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JmxComponentBuilderFactory.java
index 226d38a3ef1..2e3cfc9b383 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JmxComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JmxComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JoltComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JoltComponentBuilderFactory.java
index 61f79b65c5b..80595ad5cdd 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JoltComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JoltComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JooqComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JooqComponentBuilderFactory.java
index bcc67eac0e1..8f581a7869e 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JooqComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JooqComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JpaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JpaComponentBuilderFactory.java
index af9992ab825..b612d61650b 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JpaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JpaComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JsltComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JsltComponentBuilderFactory.java
index 38fe557aaf1..9f29802b4b2 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JsltComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JsltComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JsonPatchComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JsonPatchComponentBuilderFactory.java
index 350277bcb2a..2a5aed9bac8 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JsonPatchComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JsonPatchComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JsonValidatorComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JsonValidatorComponentBuilderFactory.java
index cf35efc94b1..ac00d19d1de 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JsonValidatorComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JsonValidatorComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JsonataComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JsonataComponentBuilderFactory.java
index 738ff21806a..c4b1ed32908 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JsonataComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JsonataComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Jt400ComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Jt400ComponentBuilderFactory.java
index 8e4dae636e0..b8bf65ce82c 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Jt400ComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Jt400ComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KafkaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KafkaComponentBuilderFactory.java
index 93c1e6f884f..2c1a92b7f21 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KafkaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KafkaComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KameletComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KameletComponentBuilderFactory.java
index 9a5b1991382..071fd8279b6 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KameletComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KameletComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KnativeComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KnativeComponentBuilderFactory.java
index 4bbbc31666b..9a37a9035bf 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KnativeComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KnativeComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesConfigMapsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesConfigMapsComponentBuilderFactory.java
index 5e66f7d7e3b..abf9bccc879 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesConfigMapsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesConfigMapsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesCustomResourcesComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesCustomResourcesComponentBuilderFactory.java
index 3268a138484..2106759334f 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesCustomResourcesComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesCustomResourcesComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesDeploymentsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesDeploymentsComponentBuilderFactory.java
index 1165c8d5278..1e64a2cf244 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesDeploymentsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesDeploymentsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesEventsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesEventsComponentBuilderFactory.java
index 748f50f6a05..0e270d8bbbc 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesEventsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesEventsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesHpaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesHpaComponentBuilderFactory.java
index cb1fa1fbec4..1828f2b064d 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesHpaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesHpaComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesJobComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesJobComponentBuilderFactory.java
index e2860e228b5..c521cf13173 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesJobComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesJobComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesNamespacesComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesNamespacesComponentBuilderFactory.java
index 4c1f9cc3436..6c4aaeee9b6 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesNamespacesComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesNamespacesComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesNodesComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesNodesComponentBuilderFactory.java
index 773e3e0723a..f8a372e50ed 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesNodesComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesNodesComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesPersistentVolumesClaimsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesPersistentVolumesClaimsComponentBuilderFactory.java
index 2241207fad2..21c9dca27a6 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesPersistentVolumesClaimsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesPersistentVolumesClaimsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesPersistentVolumesComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesPersistentVolumesComponentBuilderFactory.java
index aaf5565024c..b532e073fc8 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesPersistentVolumesComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesPersistentVolumesComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesPodsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesPodsComponentBuilderFactory.java
index ba5468a95e5..a9b65b113cf 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesPodsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesPodsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesReplicationControllersComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesReplicationControllersComponentBuilderFactory.java
index 5b50a75035d..43a6ec81822 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesReplicationControllersComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesReplicationControllersComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesResourcesQuotaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesResourcesQuotaComponentBuilderFactory.java
index be5cd6adfeb..ba806c8cfab 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesResourcesQuotaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesResourcesQuotaComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesSecretsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesSecretsComponentBuilderFactory.java
index 3b2e0fffdb5..984e0179f58 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesSecretsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesSecretsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesServiceAccountsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesServiceAccountsComponentBuilderFactory.java
index 93bd435873e..556261f43ec 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesServiceAccountsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesServiceAccountsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesServicesComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesServicesComponentBuilderFactory.java
index 692f4b695d4..e1f5df1a24a 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesServicesComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KubernetesServicesComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KuduComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KuduComponentBuilderFactory.java
index 28147c517b8..eb16feeff9c 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KuduComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KuduComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LanguageComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LanguageComponentBuilderFactory.java
index f35e96d6b0d..3b168f125a8 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LanguageComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LanguageComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LdapComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LdapComponentBuilderFactory.java
index 188171e8991..8a3d8b71676 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LdapComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LdapComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LdifComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LdifComponentBuilderFactory.java
index b54670b3ace..323f4c346a5 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LdifComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LdifComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LogComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LogComponentBuilderFactory.java
index 1f97e21e524..0f4d2ca0af9 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LogComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LogComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LprComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LprComponentBuilderFactory.java
index 1f97e66e31f..c2421147b1a 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LprComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LprComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LuceneComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LuceneComponentBuilderFactory.java
index 66c4e9c6b50..4c899fc94d4 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LuceneComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LuceneComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LumberjackComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LumberjackComponentBuilderFactory.java
index 4a6985606b3..71258b72ada 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LumberjackComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/LumberjackComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MapstructComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MapstructComponentBuilderFactory.java
index 610cda4e42e..8a17e41662b 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MapstructComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MapstructComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MasterComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MasterComponentBuilderFactory.java
index 02a277384fc..c9601cfb80c 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MasterComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MasterComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MetricsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MetricsComponentBuilderFactory.java
index 13b2e30ab91..dd4d141bb19 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MetricsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MetricsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MicrometerComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MicrometerComponentBuilderFactory.java
index d3e4d25dcaa..8c038f925dd 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MicrometerComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MicrometerComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MicroprofileMetricsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MicroprofileMetricsComponentBuilderFactory.java
index f812b0f8cfb..46685bdb62a 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MicroprofileMetricsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MicroprofileMetricsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MiloBrowseComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MiloBrowseComponentBuilderFactory.java
index 4a1cd025b18..3aff171ac19 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MiloBrowseComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MiloBrowseComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MiloClientComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MiloClientComponentBuilderFactory.java
index 41e8d8c4acd..a83fb1f2932 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MiloClientComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MiloClientComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MiloServerComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MiloServerComponentBuilderFactory.java
index 1d7b9e22c11..56bb2e0e3d1 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MiloServerComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MiloServerComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MinaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MinaComponentBuilderFactory.java
index 3dc23962f8c..2e7690a4a8c 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MinaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MinaComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MinioComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MinioComponentBuilderFactory.java
index ec1bbcd5029..1e7a667c8b4 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MinioComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MinioComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MllpComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MllpComponentBuilderFactory.java
index 5cc482fd6c9..348aaaff0f9 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MllpComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MllpComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MockComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MockComponentBuilderFactory.java
index 2ffd5c86835..edb166b7fa9 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MockComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MockComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MongodbComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MongodbComponentBuilderFactory.java
index 8aaae00a29f..4a82c0d87a8 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MongodbComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MongodbComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MongodbGridfsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MongodbGridfsComponentBuilderFactory.java
index e17243d4a21..9f88a32e606 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MongodbGridfsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MongodbGridfsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MustacheComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MustacheComponentBuilderFactory.java
index 5f4f1ed968c..2b594051899 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MustacheComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MustacheComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MvelComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MvelComponentBuilderFactory.java
index 1d7cb4833e9..c326a084f0c 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MvelComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MvelComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MybatisBeanComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MybatisBeanComponentBuilderFactory.java
index ca046024f12..29bd140f615 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MybatisBeanComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MybatisBeanComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MybatisComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MybatisComponentBuilderFactory.java
index d5226ce6e14..3ddc4663e58 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MybatisComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/MybatisComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NatsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NatsComponentBuilderFactory.java
index 63340299542..faf28f561e5 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NatsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NatsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyComponentBuilderFactory.java
index 4a3a6247402..5d6ddbb9ac3 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyHttpComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyHttpComponentBuilderFactory.java
index f79836a2ec6..83a5bd733f4 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyHttpComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyHttpComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NitriteComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NitriteComponentBuilderFactory.java
index 5b3126f8c54..edd3505f707 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NitriteComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NitriteComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OaipmhComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OaipmhComponentBuilderFactory.java
index 86d6588ebaf..550ac283c5f 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OaipmhComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OaipmhComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Olingo2ComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Olingo2ComponentBuilderFactory.java
index 057fde6bc12..93766b9198f 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Olingo2ComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Olingo2ComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Olingo4ComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Olingo4ComponentBuilderFactory.java
index 4c1cd6941c9..faf2a2f622a 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Olingo4ComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Olingo4ComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenshiftBuildConfigsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenshiftBuildConfigsComponentBuilderFactory.java
index 49503dcd810..85e730da5df 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenshiftBuildConfigsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenshiftBuildConfigsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenshiftBuildsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenshiftBuildsComponentBuilderFactory.java
index bd3625cfe58..fb0547e488e 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenshiftBuildsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenshiftBuildsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenshiftDeploymentconfigsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenshiftDeploymentconfigsComponentBuilderFactory.java
index 38214b9fee1..ff073fbee86 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenshiftDeploymentconfigsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenshiftDeploymentconfigsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackCinderComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackCinderComponentBuilderFactory.java
index ed66bb02575..be5a58ef50e 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackCinderComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackCinderComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackGlanceComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackGlanceComponentBuilderFactory.java
index 48916eb338d..578014da3ca 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackGlanceComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackGlanceComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackKeystoneComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackKeystoneComponentBuilderFactory.java
index 3ffbc70fc2b..706f7a388eb 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackKeystoneComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackKeystoneComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackNeutronComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackNeutronComponentBuilderFactory.java
index fa6be37f729..593a8e4664d 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackNeutronComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackNeutronComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackNovaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackNovaComponentBuilderFactory.java
index 9011ba9ce05..fcf85f5fdc7 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackNovaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackNovaComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackSwiftComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackSwiftComponentBuilderFactory.java
index 4f74afdd90b..cf932bc0822 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackSwiftComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OpenstackSwiftComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OptaplannerComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OptaplannerComponentBuilderFactory.java
index eee9905e47b..ddd31fb42f0 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OptaplannerComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/OptaplannerComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PahoComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PahoComponentBuilderFactory.java
index c198c7a7796..0c8bd2be96f 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PahoComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PahoComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PahoMqtt5ComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PahoMqtt5ComponentBuilderFactory.java
index c09115008a5..8ded36fd643 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PahoMqtt5ComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PahoMqtt5ComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PdfComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PdfComponentBuilderFactory.java
index 474f813697e..493e71123c3 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PdfComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PdfComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PgReplicationSlotComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PgReplicationSlotComponentBuilderFactory.java
index 90116ee5f72..8bc11ab8426 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PgReplicationSlotComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PgReplicationSlotComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PgeventComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PgeventComponentBuilderFactory.java
index 752c6e42c90..b4297c49407 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PgeventComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PgeventComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PlatformHttpComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PlatformHttpComponentBuilderFactory.java
index e14b1147dcd..1aaa185348c 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PlatformHttpComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PlatformHttpComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Plc4xComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Plc4xComponentBuilderFactory.java
index 303bc2e38f3..d99eb9e1415 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Plc4xComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Plc4xComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Pop3ComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Pop3ComponentBuilderFactory.java
index 005cfae483c..8a370b8a727 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Pop3ComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Pop3ComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Pop3sComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Pop3sComponentBuilderFactory.java
index 85bbe306e06..38115fe1e6b 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Pop3sComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Pop3sComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PubnubComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PubnubComponentBuilderFactory.java
index 42d53570f09..c4f16d37c30 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PubnubComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PubnubComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PulsarComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PulsarComponentBuilderFactory.java
index 5391d515161..e3e30adf98e 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PulsarComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/PulsarComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/QuartzComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/QuartzComponentBuilderFactory.java
index 7bc22e4b3ab..bb0e86363f3 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/QuartzComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/QuartzComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/QuickfixComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/QuickfixComponentBuilderFactory.java
index 41991a2ef78..454e1874c88 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/QuickfixComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/QuickfixComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RabbitmqComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RabbitmqComponentBuilderFactory.java
index 98152ababeb..4ce662b5e75 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RabbitmqComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RabbitmqComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ReactiveStreamsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ReactiveStreamsComponentBuilderFactory.java
index b68a0134a18..7372636da48 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ReactiveStreamsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ReactiveStreamsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RefComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RefComponentBuilderFactory.java
index 337a5c87d86..cb354dd6f39 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RefComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RefComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RestApiComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RestApiComponentBuilderFactory.java
index a11ba763f5a..5bc31f4ab38 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RestApiComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RestApiComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RestEndpointComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RestEndpointComponentBuilderFactory.java
index 41a41879a76..a7d98249c1f 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RestEndpointComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RestEndpointComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RestOpenapiComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RestOpenapiComponentBuilderFactory.java
index 0a50848c6cf..74be882cafe 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RestOpenapiComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RestOpenapiComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RestSwaggerComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RestSwaggerComponentBuilderFactory.java
index 5b8703d778e..9b72ef62289 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RestSwaggerComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RestSwaggerComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ResteasyComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ResteasyComponentBuilderFactory.java
index 2548348ae6d..0d6804a0879 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ResteasyComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ResteasyComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RobotframeworkComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RobotframeworkComponentBuilderFactory.java
index e8dec31b6b4..fef34f69bea 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RobotframeworkComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RobotframeworkComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RssComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RssComponentBuilderFactory.java
index 91ed599da11..fce8fd93be9 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RssComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/RssComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SagaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SagaComponentBuilderFactory.java
index 3204828a3db..00bb4b6e14b 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SagaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SagaComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java
index b204baaf8bc..a26d1f23a61 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SapNetweaverComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SapNetweaverComponentBuilderFactory.java
index b833de55faa..88b597c89ec 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SapNetweaverComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SapNetweaverComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SchedulerComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SchedulerComponentBuilderFactory.java
index 2f5f7ed9140..9b9bd331e71 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SchedulerComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SchedulerComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SchematronComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SchematronComponentBuilderFactory.java
index 41382ced357..bd5c5a9b473 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SchematronComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SchematronComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ScpComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ScpComponentBuilderFactory.java
index 51c289c58a1..01865ad350f 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ScpComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ScpComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SedaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SedaComponentBuilderFactory.java
index 2cf10b61ab6..bb9a3b51fe3 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SedaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SedaComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ServiceComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ServiceComponentBuilderFactory.java
index c538d6fff14..1a0a6917ab0 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ServiceComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ServiceComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ServicenowComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ServicenowComponentBuilderFactory.java
index 46faaa5f2a8..d2136805e8a 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ServicenowComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ServicenowComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ServletComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ServletComponentBuilderFactory.java
index 3508191cd2e..80ee3aeaf83 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ServletComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ServletComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SftpComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SftpComponentBuilderFactory.java
index ddfe6938ded..fe57860f829 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SftpComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SftpComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Sjms2ComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Sjms2ComponentBuilderFactory.java
index 5f834eedb88..130fe191121 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Sjms2ComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Sjms2ComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SjmsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SjmsComponentBuilderFactory.java
index aeec7d8cdb8..96c2bae4507 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SjmsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SjmsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SlackComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SlackComponentBuilderFactory.java
index 0eece30008f..33de72b29dc 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SlackComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SlackComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmppComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmppComponentBuilderFactory.java
index 4fe1ec29ccb..0a219db60cf 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmppComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmppComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmppsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmppsComponentBuilderFactory.java
index 86f8a85c549..468edea30ea 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmppsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmppsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmtpComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmtpComponentBuilderFactory.java
index 7e2ebb25e30..0427a3e90c1 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmtpComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmtpComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmtpsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmtpsComponentBuilderFactory.java
index c3716ea2922..0c70cec75ad 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmtpsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SmtpsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SnmpComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SnmpComponentBuilderFactory.java
index f0a0dad91cc..42e3f13e5fa 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SnmpComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SnmpComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SolrComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SolrComponentBuilderFactory.java
index c62b954536d..b86cad1f465 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SolrComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SolrComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SolrcloudComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SolrcloudComponentBuilderFactory.java
index f6c4beb6977..dc067f492ac 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SolrcloudComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SolrcloudComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SolrsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SolrsComponentBuilderFactory.java
index 9ea6538722c..55a8c4c405e 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SolrsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SolrsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SparkComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SparkComponentBuilderFactory.java
index 017c285ef36..73bc1a39a30 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SparkComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SparkComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SplunkComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SplunkComponentBuilderFactory.java
index 466345632d1..9d479f35964 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SplunkComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SplunkComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SplunkHecComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SplunkHecComponentBuilderFactory.java
index 8fd45b3fa15..9a1ccc77226 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SplunkHecComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SplunkHecComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringBatchComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringBatchComponentBuilderFactory.java
index 7d4b1d03653..5cf98e65415 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringBatchComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringBatchComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringEventComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringEventComponentBuilderFactory.java
index 75ec40b4f36..7a19e8b04ac 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringEventComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringEventComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringIntegrationComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringIntegrationComponentBuilderFactory.java
index 9de85ff7407..558c9d277da 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringIntegrationComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringIntegrationComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringJdbcComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringJdbcComponentBuilderFactory.java
index f5039bf70e8..e4af7a44539 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringJdbcComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringJdbcComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringLdapComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringLdapComponentBuilderFactory.java
index 7a3eccc10b9..5b649553b25 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringLdapComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringLdapComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringRabbitmqComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringRabbitmqComponentBuilderFactory.java
index 232be020f99..c8dad099750 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringRabbitmqComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringRabbitmqComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringRedisComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringRedisComponentBuilderFactory.java
index 64755d93667..f4a92df9865 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringRedisComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringRedisComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringWsComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringWsComponentBuilderFactory.java
index 891a83b5a6c..537b83fc77b 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringWsComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SpringWsComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SqlComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SqlComponentBuilderFactory.java
index e6ee1e9d7a1..cb1173e9910 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SqlComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SqlComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SqlStoredComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SqlStoredComponentBuilderFactory.java
index c665f61feea..5443d5a0fdc 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SqlStoredComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SqlStoredComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SshComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SshComponentBuilderFactory.java
index 3e3b8715dcf..cb7c3d7ecf4 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SshComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SshComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StaxComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StaxComponentBuilderFactory.java
index 63e577ff4a3..0932b6f9ef6 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StaxComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StaxComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StitchComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StitchComponentBuilderFactory.java
index bfbb9cea9bf..35baed4e2aa 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StitchComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StitchComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StompComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StompComponentBuilderFactory.java
index d949e21d51a..d31ab853f43 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StompComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StompComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StreamComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StreamComponentBuilderFactory.java
index 80bd624260f..d3c0320e0c4 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StreamComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StreamComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StringTemplateComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StringTemplateComponentBuilderFactory.java
index 9b2622c3f0f..24d3675d8b8 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StringTemplateComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StringTemplateComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StubComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StubComponentBuilderFactory.java
index e675690c3ed..df8560278ec 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StubComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StubComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TelegramComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TelegramComponentBuilderFactory.java
index 614d6390c34..b25b4f07e54 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TelegramComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TelegramComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ThriftComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ThriftComponentBuilderFactory.java
index 894aec8afed..1beffff8a68 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ThriftComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ThriftComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TikaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TikaComponentBuilderFactory.java
index 9aa2ea5c6c2..2a5bb35c78b 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TikaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TikaComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TimerComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TimerComponentBuilderFactory.java
index 9f34378591e..eceec790a49 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TimerComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TimerComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwilioComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwilioComponentBuilderFactory.java
index ecc01fc8ff6..f440541294f 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwilioComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwilioComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwitterDirectmessageComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwitterDirectmessageComponentBuilderFactory.java
index 16c6ee8796b..cae4df863bb 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwitterDirectmessageComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwitterDirectmessageComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwitterSearchComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwitterSearchComponentBuilderFactory.java
index b5d0dcd1b7f..c65c3399052 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwitterSearchComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwitterSearchComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwitterTimelineComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwitterTimelineComponentBuilderFactory.java
index 6432aa2fba8..b48eb287b35 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwitterTimelineComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/TwitterTimelineComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/UndertowComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/UndertowComponentBuilderFactory.java
index 2911c66db88..074b21c8938 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/UndertowComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/UndertowComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ValidatorComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ValidatorComponentBuilderFactory.java
index 5333e037876..aaa50a1f97c 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ValidatorComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ValidatorComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VelocityComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VelocityComponentBuilderFactory.java
index fefed82e155..28dc4defacb 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VelocityComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VelocityComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxComponentBuilderFactory.java
index fd16cc59a1c..ba7d9aaed26 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxHttpComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxHttpComponentBuilderFactory.java
index 267087d96f5..af2e3babd32 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxHttpComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxHttpComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxKafkaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxKafkaComponentBuilderFactory.java
index 7f804f65144..e4ceae04aa3 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxKafkaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxKafkaComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxWebsocketComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxWebsocketComponentBuilderFactory.java
index a8855395fe9..18896ce1f56 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxWebsocketComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VertxWebsocketComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VmComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VmComponentBuilderFactory.java
index 9e1bdca2d6d..58146d53fb8 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VmComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/VmComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WeatherComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WeatherComponentBuilderFactory.java
index 9261b5e0f30..34ed9c45611 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WeatherComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WeatherComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Web3jComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Web3jComponentBuilderFactory.java
index 4a747a0caaa..1ae54977583 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Web3jComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Web3jComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WebhookComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WebhookComponentBuilderFactory.java
index 1509daa3e8f..7386bd0cc18 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WebhookComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WebhookComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WebsocketComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WebsocketComponentBuilderFactory.java
index c04208f172e..9fd5d0332e3 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WebsocketComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WebsocketComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WebsocketJsr356ComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WebsocketJsr356ComponentBuilderFactory.java
index 9ce3a05191a..0a38383f032 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WebsocketJsr356ComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WebsocketJsr356ComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WekaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WekaComponentBuilderFactory.java
index e55de2d167b..2cba482b566 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WekaComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WekaComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WhatsappComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WhatsappComponentBuilderFactory.java
index c027192ac19..5a938dc9226 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WhatsappComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WhatsappComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WordpressComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WordpressComponentBuilderFactory.java
index c254e9b12c8..192044f645b 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WordpressComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WordpressComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WorkdayComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WorkdayComponentBuilderFactory.java
index ae54bfc36bb..ea30779c986 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WorkdayComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WorkdayComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XchangeComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XchangeComponentBuilderFactory.java
index 5c328586868..6b1d117a972 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XchangeComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XchangeComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XjComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XjComponentBuilderFactory.java
index 09ecb48a872..522b74b8741 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XjComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XjComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecuritySignComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecuritySignComponentBuilderFactory.java
index bb3669de084..8c9c16742e8 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecuritySignComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecuritySignComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecurityVerifyComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecurityVerifyComponentBuilderFactory.java
index 6d25df65bb4..a27cd49d5ce 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecurityVerifyComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecurityVerifyComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmppComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmppComponentBuilderFactory.java
index b8a560d9962..ac2b6fd838c 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmppComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmppComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XqueryComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XqueryComponentBuilderFactory.java
index 88a31f94263..71e7745f4e4 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XqueryComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XqueryComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XsltComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XsltComponentBuilderFactory.java
index 2c88aad94c3..48169a94e3e 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XsltComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XsltComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XsltSaxonComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XsltSaxonComponentBuilderFactory.java
index 54a1ccb6454..3a983d9d87e 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XsltSaxonComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XsltSaxonComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ZendeskComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ZendeskComponentBuilderFactory.java
index b565bf4b32c..0551c019d59 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ZendeskComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ZendeskComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ZookeeperComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ZookeeperComponentBuilderFactory.java
index 70b85f76de4..0e571b750ae 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ZookeeperComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ZookeeperComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ZookeeperMasterComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ZookeeperMasterComponentBuilderFactory.java
index 203561dc107..9631e7ff0c8 100644
--- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ZookeeperMasterComponentBuilderFactory.java
+++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ZookeeperMasterComponentBuilderFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.builder.component.dsl;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
index e69f3f47480..3458740aa7a 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
@@ -20,7 +20,7 @@ package org.apache.camel.builder.endpoint;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 /**
  * Generated by camel build tools - do NOT edit this file!
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
index e7c88d9e4ce..717320d8417 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
@@ -17,7 +17,7 @@
 //CHECKSTYLE:OFF
 package org.apache.camel.builder.endpoint;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 /**
  * Generated by camel build tools - do NOT edit this file!
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
index 32352f3b1eb..1a31abb3df5 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
@@ -17,7 +17,7 @@
 //CHECKSTYLE:OFF
 package org.apache.camel.builder.endpoint;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 
 /**
  * Generated by camel build tools - do NOT edit this file!
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java
index 12c12ae2f6d..e0dd94a1b65 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AS2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AS2EndpointBuilderFactory.java
index 7b5c1884668..b5204728028 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AS2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AS2EndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2EC2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2EC2EndpointBuilderFactory.java
index b2f53b9ca10..8199792c3b3 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2EC2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2EC2EndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java
index 60de0d47d8e..2c1a6d1e82c 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java
index 350d46cea33..648a05784b1 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ArangoDbEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ArangoDbEndpointBuilderFactory.java
index 47ed16431cb..a73b29a7453 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ArangoDbEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ArangoDbEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AsteriskEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AsteriskEndpointBuilderFactory.java
index 50a40b4c789..dabfb0b6222 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AsteriskEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AsteriskEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Athena2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Athena2EndpointBuilderFactory.java
index dcfd1b0a6a7..c2dcd6ffa49 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Athena2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Athena2EndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtlasMapEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtlasMapEndpointBuilderFactory.java
index d438b3a74e1..b230d650dcb 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtlasMapEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtlasMapEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosEndpointBuilderFactory.java
index 92a8757663c..5d882dd2062 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java
index 64690e9b0dc..3cdde812f4b 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomEndpointBuilderFactory.java
index 2a3b86cad7b..dc0340d78c1 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AvroEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AvroEndpointBuilderFactory.java
index e68f3795055..7a9636e1094 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AvroEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AvroEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanEndpointBuilderFactory.java
index 6106fb606f9..c5ce441b431 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java
index c76adb2d234..2bf8352aded 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BlobEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BlobEndpointBuilderFactory.java
index 3e8ab6862ce..a763d79126e 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BlobEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BlobEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BonitaEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BonitaEndpointBuilderFactory.java
index 6253dd26369..5faf99c0cba 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BonitaEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BonitaEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BoxEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BoxEndpointBuilderFactory.java
index 70f2b8b613d..fb901a7faa6 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BoxEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BoxEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java
index 1a9dde49a8d..96424949602 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BrowseEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BrowseEndpointBuilderFactory.java
index 9882d528f3f..e1fa905e032 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BrowseEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BrowseEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CMEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CMEndpointBuilderFactory.java
index 8dee2676c3d..991d2b58470 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CMEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CMEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CMISEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CMISEndpointBuilderFactory.java
index 31aa3899d15..bfbe25b406b 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CMISEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CMISEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineCacheEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineCacheEndpointBuilderFactory.java
index ad037f9922c..da5a218546e 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineCacheEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineCacheEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineLoadCacheEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineLoadCacheEndpointBuilderFactory.java
index 2f615bdcf4b..e06358f12ff 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineLoadCacheEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineLoadCacheEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java
index 90887f9d353..abd37e6b4cf 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ChatScriptEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ChatScriptEndpointBuilderFactory.java
index 4e2b05a843b..b3c9b4a6562 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ChatScriptEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ChatScriptEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ChunkEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ChunkEndpointBuilderFactory.java
index a9109670546..3a4d90ab47b 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ChunkEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ChunkEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CinderEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CinderEndpointBuilderFactory.java
index b36b8992405..9592989f672 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CinderEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CinderEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClassEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClassEndpointBuilderFactory.java
index 9ada60520a7..7ca9c4bac8d 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClassEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClassEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java
index 8a76bb4a827..57c200a90d9 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CloudtrailEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CloudtrailEndpointBuilderFactory.java
index dec6af03add..9ab0a6318d5 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CloudtrailEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CloudtrailEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CoAPEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CoAPEndpointBuilderFactory.java
index f0a47e5cae2..f917d824a66 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CoAPEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CoAPEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CometdEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CometdEndpointBuilderFactory.java
index e4224253afb..5c22e0c3541 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CometdEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CometdEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
index 68c5f1328e6..9088bdad846 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java
index 2ea4470a193..940084d1914 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CordaEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CordaEndpointBuilderFactory.java
index ee68717da5d..b21673351cc 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CordaEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CordaEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CosmosDbEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CosmosDbEndpointBuilderFactory.java
index 767907d912f..9eea8b09ec8 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CosmosDbEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CosmosDbEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchDbEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchDbEndpointBuilderFactory.java
index 1acc3aabace..25c755f06d5 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchDbEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchDbEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java
index fa8c7a0ecf0..e83f90afd5a 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CronEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CronEndpointBuilderFactory.java
index 32b81b3f756..5d9602636c3 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CronEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CronEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Cw2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Cw2EndpointBuilderFactory.java
index 0d624a4fca9..6a270120b35 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Cw2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Cw2EndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfEndpointBuilderFactory.java
index a1cbaa803c5..856358b0484 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java
index 4c3028f6e68..9fae35df911 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DJLEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DJLEndpointBuilderFactory.java
index 98d62a2bdac..d30a0e407d7 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DJLEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DJLEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DMSEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DMSEndpointBuilderFactory.java
index ffe011c0a53..bc11622312b 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DMSEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DMSEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataFormatEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataFormatEndpointBuilderFactory.java
index 9bf9423e719..fbbc22b0f9e 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataFormatEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataFormatEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataLakeEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataLakeEndpointBuilderFactory.java
index f2cc8d35aa8..3994d9b8cfa 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataLakeEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataLakeEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java
index 24cbe6a5f2d..74afb328253 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java
index dcea19c8c94..8b9f57799b0 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2EndpointBuilderFactory.java
index 401cc21a212..4e236337b0e 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2EndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2StreamEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2StreamEndpointBuilderFactory.java
index ff4a893cac5..894bb33680b 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2StreamEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2StreamEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumDb2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumDb2EndpointBuilderFactory.java
index c920d6294ad..df5789c0953 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumDb2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumDb2EndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java
index f1818a27c0b..ab356443194 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java
index 3b9e2736572..b89c3a65bcb 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumOracleEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumOracleEndpointBuilderFactory.java
index cd1a98bf6a8..1c9f702a261 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumOracleEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumOracleEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumPostgresEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumPostgresEndpointBuilderFactory.java
index ebed7bd9fee..1a65cacfa06 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumPostgresEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumPostgresEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumSqlserverEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumSqlserverEndpointBuilderFactory.java
index 18025ed4b16..ed725b84cad 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumSqlserverEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumSqlserverEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DigitalOceanEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DigitalOceanEndpointBuilderFactory.java
index 2363edcd4ff..1073710f71a 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DigitalOceanEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DigitalOceanEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DigitalSignatureEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DigitalSignatureEndpointBuilderFactory.java
index 100ba5c2089..c7083255767 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DigitalSignatureEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DigitalSignatureEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectEndpointBuilderFactory.java
index bcb0c99ffbc..d7e6924da87 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectVmEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectVmEndpointBuilderFactory.java
index 964a696f545..fa2e4ab4474 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectVmEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectVmEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorEndpointBuilderFactory.java
index 34c2ef141f6..10d48b11a22 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorVmEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorVmEndpointBuilderFactory.java
index 4ecca8904bc..5d0f475c86e 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorVmEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorVmEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DnsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DnsEndpointBuilderFactory.java
index cd804340deb..4d391b2ba7b 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DnsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DnsEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
index 12cc354af00..3aac909027f 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DozerEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DozerEndpointBuilderFactory.java
index 9dcfc6139ed..73bc514101c 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DozerEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DozerEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java
index c57e40eb31e..82bb533a1f4 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DropboxEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DropboxEndpointBuilderFactory.java
index 81084c8adf0..c7028a3bdae 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DropboxEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DropboxEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DynamicRouterEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DynamicRouterEndpointBuilderFactory.java
index a24221efccf..aab1f7698cf 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DynamicRouterEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DynamicRouterEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECS2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECS2EndpointBuilderFactory.java
index 348f36b4188..f4b44d8f6da 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECS2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECS2EndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
index cb40dac5346..a3cf1051591 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EhcacheEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EhcacheEndpointBuilderFactory.java
index bdd1a8ea8be..a44db6555b4 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EhcacheEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EhcacheEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
index 82e50eb4a3d..393bf14de66 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchRestEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchRestEndpointBuilderFactory.java
index e0c8a985ab9..cfeda2de510 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchRestEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchRestEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Etcd3EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Etcd3EndpointBuilderFactory.java
index 968a186cb6e..c8160dbe361 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Etcd3EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Etcd3EndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EventEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EventEndpointBuilderFactory.java
index 7bf961d6c81..0027c8c5b1a 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EventEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EventEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EventHubsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EventHubsEndpointBuilderFactory.java
index e739f5f8a08..60c4dbd1737 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EventHubsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EventHubsEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EventbridgeEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EventbridgeEndpointBuilderFactory.java
index 0d5d110ae54..289cda6120b 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EventbridgeEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EventbridgeEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ExecEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ExecEndpointBuilderFactory.java
index 279397dd6c9..c61c07bc370 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ExecEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ExecEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FaceRecognitionEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FaceRecognitionEndpointBuilderFactory.java
index e13171d1e61..d134e283a7a 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FaceRecognitionEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FaceRecognitionEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FacebookEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FacebookEndpointBuilderFactory.java
index 207b5e78f6d..88ab634a17f 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FacebookEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FacebookEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FhirEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FhirEndpointBuilderFactory.java
index eadc46d838d..337d4034bec 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FhirEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FhirEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java
index ccda20a1889..8ea8c613354 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileWatchEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileWatchEndpointBuilderFactory.java
index 43f4a47b979..a835b2c04d9 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileWatchEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileWatchEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FlatpackEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FlatpackEndpointBuilderFactory.java
index 2839a137563..ad98a44adf2 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FlatpackEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FlatpackEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FlinkEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FlinkEndpointBuilderFactory.java
index 22c7edb0b54..165d9b719ca 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FlinkEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FlinkEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FopEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FopEndpointBuilderFactory.java
index aa9dc123258..9fd013c81aa 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FopEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FopEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FreemarkerEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FreemarkerEndpointBuilderFactory.java
index cac3e202a62..3162c91b182 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FreemarkerEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FreemarkerEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java
index 0306aa82863..d90e7f68fc2 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
index eebb6e0858b..9eb6942502f 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FunctionGraphEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FunctionGraphEndpointBuilderFactory.java
index 96818cb5e61..672a057ef4c 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FunctionGraphEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FunctionGraphEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GeoCoderEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GeoCoderEndpointBuilderFactory.java
index a09c2573278..dbe67cac366 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GeoCoderEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GeoCoderEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitEndpointBuilderFactory.java
index d3e8401a516..48a37bb86d4 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitHubEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitHubEndpointBuilderFactory.java
index 71ae6a73dc2..53cc438b25b 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitHubEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitHubEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GlanceEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GlanceEndpointBuilderFactory.java
index 33424621ff1..4630206ef91 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GlanceEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GlanceEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java
index 2a41f1140cc..7eec54f5002 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java
index 774661f6237..644c9e7926b 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarEndpointBuilderFactory.java
index e4314167036..f55da3170d2 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java
index e9505edfd05..b27180bee5a 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarStreamEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCloudFunctionsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCloudFunctionsEndpointBuilderFactory.java
index e00bc33d800..34eed9e6640 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCloudFunctionsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCloudFunctionsEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCloudStorageEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCloudStorageEndpointBuilderFactory.java
index 896d0c5447c..63a3f869ad9 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCloudStorageEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCloudStorageEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleDriveEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleDriveEndpointBuilderFactory.java
index 3c89e222eb0..5045e9cef4f 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleDriveEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleDriveEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailEndpointBuilderFactory.java
index e89e65f9bd2..1a228298024 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java
index b6b79629ca4..0f906bc82b0 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailStreamEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
index af5a072b68b..c5355e45fb1 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSecretManagerEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSecretManagerEndpointBuilderFactory.java
index ffe0e8632fc..88c54f68ea0 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSecretManagerEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSecretManagerEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java
index 80440ee012c..4e9f4985ac1 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java
index 27e8b2b7983..d74bb9ebfb2 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoraEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoraEndpointBuilderFactory.java
index aaa851c8f6d..49a2cab9337 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoraEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoraEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GrapeEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GrapeEndpointBuilderFactory.java
index ed1941798a1..f69986cde01 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GrapeEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GrapeEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GraphqlEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GraphqlEndpointBuilderFactory.java
index 271773bab48..2399173da99 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GraphqlEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GraphqlEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GridFsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GridFsEndpointBuilderFactory.java
index 310d7a3cc9b..75d2a7d1c5d 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GridFsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GridFsEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GrpcEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GrpcEndpointBuilderFactory.java
index ae7f23f8c8d..bcd72606f40 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GrpcEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GrpcEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GuavaEventBusEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GuavaEventBusEndpointBuilderFactory.java
index 71db1502819..ff7922d6983 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GuavaEventBusEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GuavaEventBusEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HBaseEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HBaseEndpointBuilderFactory.java
index db2316c13b3..b908569363a 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HBaseEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HBaseEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HashicorpVaultEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HashicorpVaultEndpointBuilderFactory.java
index 7da9a87049a..bd853b30ae0 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HashicorpVaultEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HashicorpVaultEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastAtomicnumberEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastAtomicnumberEndpointBuilderFactory.java
index 90f8d272609..f58fad967db 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastAtomicnumberEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastAtomicnumberEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastInstanceEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastInstanceEndpointBuilderFactory.java
index 9d852915e75..c3b052ed529 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastInstanceEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastInstanceEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastListEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastListEndpointBuilderFactory.java
index 1cd0ff2efb3..c3cb91d61d8 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastListEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastListEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastMapEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastMapEndpointBuilderFactory.java
index 3c3442c1cc7..d12660375e5 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastMapEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastMapEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastMultimapEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastMultimapEndpointBuilderFactory.java
index 28ba82d72fd..47ddd1d2d3e 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastMultimapEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastMultimapEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastQueueEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastQueueEndpointBuilderFactory.java
index f5ebec51461..b743b501232 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastQueueEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastQueueEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastReplicatedmapEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastReplicatedmapEndpointBuilderFactory.java
index c7aea99c155..839bd8b04e4 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastReplicatedmapEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastReplicatedmapEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastRingbufferEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastRingbufferEndpointBuilderFactory.java
index 7eb8eae0534..942531ebb12 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastRingbufferEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastRingbufferEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSedaEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSedaEndpointBuilderFactory.java
index 17fa0b595e1..45bbfb67f02 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSedaEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSedaEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSetEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSetEndpointBuilderFactory.java
index 9f6171a8ec0..8db235435d0 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSetEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSetEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastTopicEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastTopicEndpointBuilderFactory.java
index e1b84203909..37271208737 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastTopicEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastTopicEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HdfsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HdfsEndpointBuilderFactory.java
index 03464a933be..1fb105c271f 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HdfsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HdfsEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
index 360bc02b245..08ab75bc133 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HyperledgerAriesEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HyperledgerAriesEndpointBuilderFactory.java
index 878b95d1640..e169b9883a0 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HyperledgerAriesEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HyperledgerAriesEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IAM2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IAM2EndpointBuilderFactory.java
index 75976c76b3f..8093cf6fd00 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IAM2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IAM2EndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IAMEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IAMEndpointBuilderFactory.java
index 734ffa8e3bb..faef1d24278 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IAMEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IAMEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IOTAEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IOTAEndpointBuilderFactory.java
index c251890868e..9fbe31efd81 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IOTAEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IOTAEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IPFSEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IPFSEndpointBuilderFactory.java
index 8d6bb3bf892..47893cb93ca 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IPFSEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IPFSEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteCacheEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteCacheEndpointBuilderFactory.java
index 4bb306b6511..965549452c1 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteCacheEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteCacheEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteComputeEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteComputeEndpointBuilderFactory.java
index df520c7139f..d0358ac1bf0 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteComputeEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteComputeEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteEventsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteEventsEndpointBuilderFactory.java
index 6fce7db8e34..1786c5a4b6e 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteEventsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteEventsEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteIdGenEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteIdGenEndpointBuilderFactory.java
index 16ad092e02a..60b0f04f812 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteIdGenEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteIdGenEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteMessagingEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteMessagingEndpointBuilderFactory.java
index 62d3dd8f5d3..00361e88ac2 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteMessagingEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteMessagingEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteQueueEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteQueueEndpointBuilderFactory.java
index a3b0c035d23..6f24b1e48d6 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteQueueEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteQueueEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteSetEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteSetEndpointBuilderFactory.java
index ec076403272..96be94297d6 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteSetEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteSetEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ImageRecognitionEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ImageRecognitionEndpointBuilderFactory.java
index 97eedf4fbf0..4f68e887284 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ImageRecognitionEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ImageRecognitionEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfinispanEmbeddedEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfinispanEmbeddedEndpointBuilderFactory.java
index f139882de5e..4f27be18dbf 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfinispanEmbeddedEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfinispanEmbeddedEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfinispanRemoteEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfinispanRemoteEndpointBuilderFactory.java
index be4fea80474..7d20b01263c 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfinispanRemoteEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfinispanRemoteEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfluxDbEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfluxDbEndpointBuilderFactory.java
index 671bc566f20..5199d448730 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfluxDbEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfluxDbEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IrcEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IrcEndpointBuilderFactory.java
index 393bb22de9c..57c4e6ac241 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IrcEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IrcEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IronMQEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IronMQEndpointBuilderFactory.java
index 08b145bb5ed..c9cda005630 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IronMQEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IronMQEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JBPMEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JBPMEndpointBuilderFactory.java
index fe3ec920c52..a192cf48e2c 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JBPMEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JBPMEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JCacheEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JCacheEndpointBuilderFactory.java
index 124528e9db9..0aea4e87fcc 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JCacheEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JCacheEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JGroupsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JGroupsEndpointBuilderFactory.java
index 6ef66bc48b7..a47e6c33e35 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JGroupsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JGroupsEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JGroupsRaftEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JGroupsRaftEndpointBuilderFactory.java
index 3ee95a2cdeb..89046f22909 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JGroupsRaftEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JGroupsRaftEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JMXEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JMXEndpointBuilderFactory.java
index e4ba2a25cdc..9e5d5a07ed0 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JMXEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JMXEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JSR356WebSocketEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JSR356WebSocketEndpointBuilderFactory.java
index 4a5f674a3ac..78aabdeb1b1 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JSR356WebSocketEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JSR356WebSocketEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JcloudsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JcloudsEndpointBuilderFactory.java
index 6cf2e7917da..ce04fbef506 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JcloudsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JcloudsEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JcrEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JcrEndpointBuilderFactory.java
index 7087175e1cd..f5f50a8b061 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JcrEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JcrEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JdbcEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JdbcEndpointBuilderFactory.java
index e9294bfc032..230cecdd2ae 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JdbcEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JdbcEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilderFactory.java
index e1b7e383048..3fbe59c80cd 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JettyHttpEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JiraEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JiraEndpointBuilderFactory.java
index a6e453388dd..394f0aa1685 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JiraEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JiraEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JmsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JmsEndpointBuilderFactory.java
index 57878bad590..6f85ee6f756 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JmsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JmsEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JoltEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JoltEndpointBuilderFactory.java
index d12671c34db..ff6890c9eda 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JoltEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JoltEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JooqEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JooqEndpointBuilderFactory.java
index 61c1777c886..51e200ddeb8 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JooqEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JooqEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JpaEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JpaEndpointBuilderFactory.java
index abb5a55c51a..74ea5f5c7d1 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JpaEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JpaEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsltEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsltEndpointBuilderFactory.java
index cf6b4edab40..87819a08be9 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsltEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsltEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsonPatchEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsonPatchEndpointBuilderFactory.java
index 4339f17db13..8a885c31732 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsonPatchEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsonPatchEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsonValidatorEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsonValidatorEndpointBuilderFactory.java
index c381895272b..ccf99042c52 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsonValidatorEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsonValidatorEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsonataEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsonataEndpointBuilderFactory.java
index 96513c0cdd3..0cfdfb0d0b7 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsonataEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JsonataEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Jt400EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Jt400EndpointBuilderFactory.java
index 85d5306460b..14870d866d9 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Jt400EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Jt400EndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KMS2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KMS2EndpointBuilderFactory.java
index b319cc98139..04e084e1c02 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KMS2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KMS2EndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KafkaEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KafkaEndpointBuilderFactory.java
index f955c291e99..ccd2493f020 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KafkaEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KafkaEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KameletEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KameletEndpointBuilderFactory.java
index 7818b9fe98a..d27dd776153 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KameletEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KameletEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KeyVaultEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KeyVaultEndpointBuilderFactory.java
index 706de4fdf48..9ce7e387058 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KeyVaultEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KeyVaultEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KeystoneEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KeystoneEndpointBuilderFactory.java
index e5185b59d20..4c630482629 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KeystoneEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KeystoneEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Kinesis2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Kinesis2EndpointBuilderFactory.java
index c78248afea7..6bee47ac813 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Kinesis2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Kinesis2EndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehose2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehose2EndpointBuilderFactory.java
index fff290a43f0..4e7fa8e9559 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehose2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehose2EndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KnativeEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KnativeEndpointBuilderFactory.java
index 8d8239b5971..2d9492ef3e1 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KnativeEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KnativeEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesConfigMapsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesConfigMapsEndpointBuilderFactory.java
index d33f40d4a4e..1092271dd5d 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesConfigMapsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesConfigMapsEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesCustomResourcesEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesCustomResourcesEndpointBuilderFactory.java
index 015949b6534..c49e0c66dfc 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesCustomResourcesEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesCustomResourcesEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesDeploymentsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesDeploymentsEndpointBuilderFactory.java
index 93308bf6b5e..2126de4efee 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesDeploymentsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesDeploymentsEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesEventsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesEventsEndpointBuilderFactory.java
index 3daaf96768c..0a28d0d5e39 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesEventsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesEventsEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesHPAEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesHPAEndpointBuilderFactory.java
index bb56fc66069..15c1f129b6c 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesHPAEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesHPAEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesJobEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesJobEndpointBuilderFactory.java
index 0ff3739c9b9..bad6cadbba6 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesJobEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesJobEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesNamespacesEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesNamespacesEndpointBuilderFactory.java
index 11841e9eb01..171233d568f 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesNamespacesEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesNamespacesEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesNodesEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesNodesEndpointBuilderFactory.java
index 90f43702e9f..a3b6a84fe64 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesNodesEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesNodesEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesClaimsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesClaimsEndpointBuilderFactory.java
index 3d2ccaf9492..7f1bf5ef3d4 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesClaimsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesClaimsEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesEndpointBuilderFactory.java
index 6abeff6b79f..2d6899604f4 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesPersistentVolumesEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesPodsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesPodsEndpointBuilderFactory.java
index 2c7c8e4b77a..ebd0ac61b38 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesPodsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesPodsEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesReplicationControllersEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesReplicationControllersEndpointBuilderFactory.java
index 63b914ce981..59ebff103d6 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesReplicationControllersEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesReplicationControllersEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesResourcesQuotaEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesResourcesQuotaEndpointBuilderFactory.java
index 0a6d804523f..1cf470cb9da 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesResourcesQuotaEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesResourcesQuotaEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesSecretsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesSecretsEndpointBuilderFactory.java
index ba2cf486c88..9a72308f6ce 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesSecretsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesSecretsEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesServiceAccountsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesServiceAccountsEndpointBuilderFactory.java
index f00f964f328..86535735904 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesServiceAccountsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesServiceAccountsEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesServicesEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesServicesEndpointBuilderFactory.java
index fca93e27317..c9df3735f55 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesServicesEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KubernetesServicesEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KuduEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KuduEndpointBuilderFactory.java
index 0cf010712e0..5b8fb317320 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KuduEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KuduEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Lambda2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Lambda2EndpointBuilderFactory.java
index 2bd5364027d..ef7371f030a 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Lambda2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Lambda2EndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LanguageEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LanguageEndpointBuilderFactory.java
index af2b5ed1dda..e52a6211ab1 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LanguageEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LanguageEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LdapEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LdapEndpointBuilderFactory.java
index a1667286333..4d1dd74a80a 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LdapEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LdapEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LdifEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LdifEndpointBuilderFactory.java
index 67777df8b20..53416a4c4f8 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LdifEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LdifEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LogEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LogEndpointBuilderFactory.java
index db7f9f534de..ce9a8b5a922 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LogEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LogEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LuceneEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LuceneEndpointBuilderFactory.java
index 6d321e61b4d..223bdff9a94 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LuceneEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LuceneEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LumberjackEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LumberjackEndpointBuilderFactory.java
index 1664942b0bc..d381aaa0fde 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LumberjackEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LumberjackEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MQ2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MQ2EndpointBuilderFactory.java
index ebec8dc8cea..55886f073f7 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MQ2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MQ2EndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MSK2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MSK2EndpointBuilderFactory.java
index 8c29588441a..dd32023e706 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MSK2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MSK2EndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MailEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MailEndpointBuilderFactory.java
index 82cf5654fb6..a705b9213f2 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MailEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MailEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MapstructEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MapstructEndpointBuilderFactory.java
index db8c78aca53..64173fa43e1 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MapstructEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MapstructEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MasterEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MasterEndpointBuilderFactory.java
index 9af0c75e565..e906b9f3106 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MasterEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MasterEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MetricsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MetricsEndpointBuilderFactory.java
index 85ce58eeac9..91a6e6dfc55 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MetricsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MetricsEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MicroProfileMetricsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MicroProfileMetricsEndpointBuilderFactory.java
index ffab89b5479..d119be0c92e 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MicroProfileMetricsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MicroProfileMetricsEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MicrometerEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MicrometerEndpointBuilderFactory.java
index c313a869a27..95e92a42494 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MicrometerEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MicrometerEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MiloBrowseEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MiloBrowseEndpointBuilderFactory.java
index e39c0c22bcc..e213c5347d9 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MiloBrowseEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MiloBrowseEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MiloClientEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MiloClientEndpointBuilderFactory.java
index 876182e6af3..e9ccac7d113 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MiloClientEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MiloClientEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MiloServerEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MiloServerEndpointBuilderFactory.java
index e798b80b64c..27da267acc6 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MiloServerEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MiloServerEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MinaEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MinaEndpointBuilderFactory.java
index c972b9c7819..658fbf269dd 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MinaEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MinaEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MinioEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MinioEndpointBuilderFactory.java
index 4fbf0e1379b..7da2541de68 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MinioEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MinioEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MllpEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MllpEndpointBuilderFactory.java
index b01f9c41b0d..b70250a8f92 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MllpEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MllpEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MockEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MockEndpointBuilderFactory.java
index d2876b37dc8..a1f2d36c9ea 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MockEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MockEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MongoDbEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MongoDbEndpointBuilderFactory.java
index 3d886ffa0f8..dceee13675c 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MongoDbEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MongoDbEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MustacheEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MustacheEndpointBuilderFactory.java
index c73ecc9c194..8341d37178f 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MustacheEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MustacheEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MvelEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MvelEndpointBuilderFactory.java
index 8fa47af60fd..4df4d4e3317 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MvelEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MvelEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MyBatisBeanEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MyBatisBeanEndpointBuilderFactory.java
index fd06d318be6..3cc522299c8 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MyBatisBeanEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MyBatisBeanEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MyBatisEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MyBatisEndpointBuilderFactory.java
index 33890ee8da2..4ced56d9317 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MyBatisEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MyBatisEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NatsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NatsEndpointBuilderFactory.java
index d16ae33f553..ce5f5c3987d 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NatsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NatsEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NetWeaverEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NetWeaverEndpointBuilderFactory.java
index 2f3a12577aa..974a0d265ec 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NetWeaverEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NetWeaverEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NettyEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NettyEndpointBuilderFactory.java
index 4f223ff2985..90b4c4b36fd 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NettyEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NettyEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NettyHttpEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NettyHttpEndpointBuilderFactory.java
index 2facbfa50dd..d041201c9ac 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NettyHttpEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NettyHttpEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NeutronEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NeutronEndpointBuilderFactory.java
index f7ec4cdfe8e..fd00bd07a48 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NeutronEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NeutronEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NitriteEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NitriteEndpointBuilderFactory.java
index 75069b6a0b8..c46ffe10fdf 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NitriteEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NitriteEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NovaEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NovaEndpointBuilderFactory.java
index 1c4e9396372..b7c686a8f7c 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NovaEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NovaEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OAIPMHEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OAIPMHEndpointBuilderFactory.java
index 271dcfb71d6..04dfce0a87d 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OAIPMHEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OAIPMHEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OBSEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OBSEndpointBuilderFactory.java
index 104aa3e8246..ee87eae109b 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OBSEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OBSEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Olingo2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Olingo2EndpointBuilderFactory.java
index 280810ebc60..887b7ba76e1 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Olingo2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Olingo2EndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Olingo4EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Olingo4EndpointBuilderFactory.java
index edcb9cff02d..bf366ba6b8c 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Olingo4EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Olingo4EndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildConfigsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildConfigsEndpointBuilderFactory.java
index 176d9765ca1..67a7a7b5190 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildConfigsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildConfigsEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildsEndpointBuilderFactory.java
index 80295cfc92d..d1a615edbac 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OpenshiftBuildsEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OpenshiftDeploymentConfigsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OpenshiftDeploymentConfigsEndpointBuilderFactory.java
index 302081ddff3..149fbd83503 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OpenshiftDeploymentConfigsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OpenshiftDeploymentConfigsEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OptaPlannerEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OptaPlannerEndpointBuilderFactory.java
index 97a15eddd39..f76f6320a12 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OptaPlannerEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/OptaPlannerEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PahoEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PahoEndpointBuilderFactory.java
index ff2a7b973ef..0fbd6571a65 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PahoEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PahoEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PahoMqtt5EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PahoMqtt5EndpointBuilderFactory.java
index 28ea520b408..63bf9697ea9 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PahoMqtt5EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PahoMqtt5EndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PdfEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PdfEndpointBuilderFactory.java
index aa7bb72b205..87a8c4b269f 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PdfEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PdfEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PgEventEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PgEventEndpointBuilderFactory.java
index 02cead37472..94c989a83ba 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PgEventEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PgEventEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PgReplicationSlotEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PgReplicationSlotEndpointBuilderFactory.java
index aa0862b89ff..796e79d358e 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PgReplicationSlotEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PgReplicationSlotEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PlatformHttpEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PlatformHttpEndpointBuilderFactory.java
index 4160c2aae3f..f21618e357c 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PlatformHttpEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PlatformHttpEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Plc4XEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Plc4XEndpointBuilderFactory.java
index b0170ae6964..5e99bd2b630 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Plc4XEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Plc4XEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PrinterEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PrinterEndpointBuilderFactory.java
index 7b50ee9af98..41b30f20617 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PrinterEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PrinterEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PubNubEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PubNubEndpointBuilderFactory.java
index a533cfea05b..f48698741f8 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PubNubEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PubNubEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PulsarEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PulsarEndpointBuilderFactory.java
index d25310f27df..7e74f6af132 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PulsarEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PulsarEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java
index bab848ab635..82ab4e1ec57 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/QuartzEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/QueueEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/QueueEndpointBuilderFactory.java
index 9882336ba1d..bcde10727a9 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/QueueEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/QueueEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/QuickfixjEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/QuickfixjEndpointBuilderFactory.java
index dc1e431944c..493317300fb 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/QuickfixjEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/QuickfixjEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RabbitMQEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RabbitMQEndpointBuilderFactory.java
index 671ab84e34f..f7e600775f4 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RabbitMQEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RabbitMQEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ReactiveStreamsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ReactiveStreamsEndpointBuilderFactory.java
index 2fa12771bc2..efe283aada7 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ReactiveStreamsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ReactiveStreamsEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RedisEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RedisEndpointBuilderFactory.java
index 4d048414410..4f5df024b29 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RedisEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RedisEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RefEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RefEndpointBuilderFactory.java
index a53d0b4c308..2ad8f6fb257 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RefEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RefEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RestApiEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RestApiEndpointBuilderFactory.java
index fa1e40655ab..3bbbc56afb7 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RestApiEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RestApiEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RestEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RestEndpointBuilderFactory.java
index a80d020cd41..15933781a15 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RestEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RestEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RestOpenApiEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RestOpenApiEndpointBuilderFactory.java
index f707e898503..3de577e2969 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RestOpenApiEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RestOpenApiEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RestSwaggerEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RestSwaggerEndpointBuilderFactory.java
index 21468f45321..c3bcf090d56 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RestSwaggerEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RestSwaggerEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ResteasyEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ResteasyEndpointBuilderFactory.java
index 9dc940dda4c..6c96b36443d 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ResteasyEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ResteasyEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RobotFrameworkEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RobotFrameworkEndpointBuilderFactory.java
index e178cd068f0..b34e79cf252 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RobotFrameworkEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RobotFrameworkEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RssEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RssEndpointBuilderFactory.java
index 25ea042d19a..ab39ec38941 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RssEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RssEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/STS2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/STS2EndpointBuilderFactory.java
index cd8631e2ddb..a27c8b2dc9d 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/STS2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/STS2EndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SagaEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SagaEndpointBuilderFactory.java
index 22c31c18f7e..aafb6b9d801 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SagaEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SagaEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SalesforceEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SalesforceEndpointBuilderFactory.java
index 6a940055455..567c5d8fd9a 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SalesforceEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SalesforceEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SchedulerEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SchedulerEndpointBuilderFactory.java
index 97a89ed2124..8e13bde8ad8 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SchedulerEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SchedulerEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SchematronEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SchematronEndpointBuilderFactory.java
index 7d42945362b..f1c67d83a5d 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SchematronEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SchematronEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ScpEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ScpEndpointBuilderFactory.java
index e79e118ea05..aebb8204216 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ScpEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ScpEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SecretsManagerEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SecretsManagerEndpointBuilderFactory.java
index af85bfa5320..99c1b29185e 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SecretsManagerEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SecretsManagerEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SedaEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SedaEndpointBuilderFactory.java
index 29f160a5aef..3de0ba8e5c4 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SedaEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SedaEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServerEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServerEndpointBuilderFactory.java
index d490b9e4d64..bdb742a5ab0 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServerEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServerEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServiceBusEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServiceBusEndpointBuilderFactory.java
index 20e0bd718f6..c96734a2abc 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServiceBusEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServiceBusEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServiceEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServiceEndpointBuilderFactory.java
index 2978e7efab7..4808efc9e64 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServiceEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServiceEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServiceNowEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServiceNowEndpointBuilderFactory.java
index d8977314f66..6aeecc8ac48 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServiceNowEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServiceNowEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServletEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServletEndpointBuilderFactory.java
index f8332f3ee97..96c4b1062f1 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServletEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServletEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ses2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ses2EndpointBuilderFactory.java
index 77cda62ad2f..a6e160606a8 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ses2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ses2EndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SftpEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SftpEndpointBuilderFactory.java
index f6f459c31d8..614d414999a 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SftpEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SftpEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SimpleNotificationEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SimpleNotificationEndpointBuilderFactory.java
index d5594bdfde6..52960b7a2c8 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SimpleNotificationEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SimpleNotificationEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sjms2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sjms2EndpointBuilderFactory.java
index 11d8a561f1b..cb017f3ecd5 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sjms2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sjms2EndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SjmsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SjmsEndpointBuilderFactory.java
index 17b7da0a242..84b77e4f0d7 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SjmsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SjmsEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SlackEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SlackEndpointBuilderFactory.java
index 5f95ec7b829..83ef6f689e7 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SlackEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SlackEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SmppEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SmppEndpointBuilderFactory.java
index a4f0034a391..a7f433fb464 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SmppEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SmppEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SnmpEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SnmpEndpointBuilderFactory.java
index 990c53779ae..b1f7b9b678b 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SnmpEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SnmpEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sns2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sns2EndpointBuilderFactory.java
index 4801d46b7ce..88fbe67d704 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sns2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sns2EndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SolrEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SolrEndpointBuilderFactory.java
index d9be99d1826..dc9ccb9682f 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SolrEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SolrEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SparkEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SparkEndpointBuilderFactory.java
index 7f88e5f9311..878ce23c225 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SparkEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SparkEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SplunkEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SplunkEndpointBuilderFactory.java
index 7b9e8877e8f..8c9572f2000 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SplunkEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SplunkEndpointBuilderFactory.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SplunkHECEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SplunkHECEndpointBuilderFactory.java
index 73db8b43b03..753158e3014 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SplunkHECEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SplunkHECEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringBatchEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringBatchEndpointBuilderFactory.java
index 0f66f7cd470..1cb65bead41 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringBatchEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringBatchEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringIntegrationEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringIntegrationEndpointBuilderFactory.java
index b8fc36ba2d9..e1d5e55cca0 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringIntegrationEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringIntegrationEndpointBuilderFactory.java
@@ -20,7 +20,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.stream.*;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
... 937 lines suppressed ...


[camel] 07/08: Migration to Jetty 11

Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch jakarta-rewritten
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 80091807ad7411f9c8e733b9391f0f236db469bf
Author: Vladimir V. Bychkov <gi...@bychkov.name>
AuthorDate: Mon Nov 14 09:56:27 2022 +0100

    Migration to Jetty 11
    
    (cherry picked from commit e5aea792291557b86b10eb84b978b381c2d94be6)
---
 .../camel/component/cometd/CometdComponent.java    |  2 +-
 .../services/org/apache/camel/other.properties     |  2 +-
 .../src/generated/resources/jetty-common.json      |  2 +-
 .../component/jetty/CamelContinuationServlet.java  | 70 +++++++++++++++-------
 .../camel/component/jetty/JettyHttpComponent.java  | 23 ++-----
 .../camel/component/jetty/MultiPartFilter.java     |  2 +-
 .../JettyHttp11EndpointUriFactory.java}            |  4 +-
 .../JettyHttpComponent11Configurer.java}           | 13 ++--
 .../JettyHttpEndpoint11Configurer.java}            | 13 ++--
 .../services/org/apache/camel/component/jetty      |  2 +-
 .../org/apache/camel/configurer/jetty-component    |  2 +-
 .../org/apache/camel/configurer/jetty-endpoint     |  2 +-
 .../services/org/apache/camel/send-dynamic/jetty   |  2 +-
 .../org/apache/camel/urifactory/jetty-endpoint     |  2 +-
 .../camel/component/{jetty9 => jetty11}/jetty.json |  4 +-
 .../camel-jetty/src/main/docs/jetty-component.adoc |  2 +-
 .../{jetty9 => jetty11}/AttachmentHttpBinding.java | 11 ++--
 .../CamelInputStreamContentProvider.java           |  2 +-
 .../{jetty9 => jetty11}/HttpSendDynamicAware.java  |  2 +-
 .../JettyContentExchange11.java}                   |  6 +-
 .../JettyHttpComponent11.java}                     | 10 ++--
 .../JettyHttpEndpoint11.java}                      | 12 ++--
 .../jetty/JettyComponentMuteExceptionTest.java     |  6 +-
 .../jetty/JettyHttpEndpointDisconnectTest.java     |  5 +-
 .../jetty/TwoCamelContextWithJettyRouteTest.java   | 10 ++--
 .../async/JettyAsyncContinuationTimeoutTest.java   |  2 +-
 .../jetty/JettyComponentSpringConfiguredTest.xml   |  2 +-
 .../apache/camel/component/jetty/jetty-https.xml   |  2 +-
 .../tracing/decorators/JettySpanDecorator.java     |  2 +-
 .../infra/jetty/services/JettyEmbeddedService.java |  2 +-
 30 files changed, 115 insertions(+), 106 deletions(-)

diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
index 12f5338d5d3..f0d61e77b52 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
@@ -233,7 +233,7 @@ public class CometdComponent extends DefaultComponent implements SSLContextParam
             sslParams = retrieveGlobalSslContextParameters();
         }
 
-        SslContextFactory sslContextFactory = new SslContextFactory();
+        SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
         sslContextFactory.setEndpointIdentificationAlgorithm(null);
         if (sslParams != null) {
             sslContextFactory.setSslContext(sslParams.createSSLContext(getCamelContext()));
diff --git a/components/camel-jetty-common/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-jetty-common/src/generated/resources/META-INF/services/org/apache/camel/other.properties
index 4bd0b14e0b8..2f8523a0a41 100644
--- a/components/camel-jetty-common/src/generated/resources/META-INF/services/org/apache/camel/other.properties
+++ b/components/camel-jetty-common/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -4,4 +4,4 @@ groupId=org.apache.camel
 artifactId=camel-jetty-common
 version=4.0.0-SNAPSHOT
 projectName=Camel :: Jetty :: Common
-projectDescription=Camel Jetty 9.x support
+projectDescription=Camel Jetty 11.x support
diff --git a/components/camel-jetty-common/src/generated/resources/jetty-common.json b/components/camel-jetty-common/src/generated/resources/jetty-common.json
index 5b3692c7b37..bb8eaa1de6e 100644
--- a/components/camel-jetty-common/src/generated/resources/jetty-common.json
+++ b/components/camel-jetty-common/src/generated/resources/jetty-common.json
@@ -3,7 +3,7 @@
     "kind": "other",
     "name": "jetty-common",
     "title": "Jetty Common",
-    "description": "Camel Jetty 9.x support",
+    "description": "Camel Jetty 11.x support",
     "deprecated": false,
     "firstVersion": "2.15.0",
     "supportLevel": "Stable",
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
index d29ec69c55d..f84464c92d3 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
@@ -23,6 +23,10 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.AsyncEvent;
+import jakarta.servlet.AsyncListener;
+import jakarta.servlet.DispatcherType;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -41,8 +45,6 @@ import org.apache.camel.http.common.HttpMessage;
 import org.apache.camel.spi.UnitOfWork;
 import org.apache.camel.support.ObjectHelper;
 import org.apache.camel.util.UnsafeUriCharactersEncoder;
-import org.eclipse.jetty.continuation.Continuation;
-import org.eclipse.jetty.continuation.ContinuationSupport;
 
 /**
  * Servlet which leverage <a href="http://wiki.eclipse.org/Jetty/Feature/Continuations">Jetty Continuations</a>.
@@ -162,27 +164,19 @@ public class CamelContinuationServlet extends CamelServlet {
         final Exchange result = (Exchange) request.getAttribute(EXCHANGE_ATTRIBUTE_NAME);
         if (result == null) {
             // no asynchronous result so leverage continuation
-            final Continuation continuation = ContinuationSupport.getContinuation(request);
-            if (continuation.isInitial() && continuationTimeout != null) {
+            AsyncContext asyncContext = request.startAsync();
+            if (isInitial(request) && continuationTimeout != null) {
                 // set timeout on initial
-                continuation.setTimeout(continuationTimeout);
+                asyncContext.setTimeout(continuationTimeout.longValue());
             }
+            asyncContext.addListener(new ExpiredListener(consumer), request, response);
 
             // are we suspended and a request is dispatched initially?
-            if (consumer.isSuspended() && continuation.isInitial()) {
+            if (consumer.isSuspended() && isInitial(request)) {
                 response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
                 return;
             }
 
-            if (continuation.isExpired()) {
-                String id = (String) continuation.getAttribute(EXCHANGE_ATTRIBUTE_ID);
-                // remember this id as expired
-                expiredExchanges.put(id, id);
-                log.warn("Continuation expired of exchangeId: {}", id);
-                consumer.getBinding().doWriteExceptionResponse(new TimeoutException(), response);
-                return;
-            }
-
             // a new request so create an exchange
             // must be prototype scoped (not pooled) so we create the exchange via endpoint
             final Exchange exchange = consumer.createExchange(false);
@@ -215,7 +209,7 @@ public class CamelContinuationServlet extends CamelServlet {
             if (log.isTraceEnabled()) {
                 log.trace("Suspending continuation of exchangeId: {}", exchange.getExchangeId());
             }
-            continuation.setAttribute(EXCHANGE_ATTRIBUTE_ID, exchange.getExchangeId());
+            request.setAttribute(EXCHANGE_ATTRIBUTE_ID, exchange.getExchangeId());
 
             // we want to handle the UoW
             UnitOfWork uow = exchange.getUnitOfWork();
@@ -232,9 +226,6 @@ public class CamelContinuationServlet extends CamelServlet {
                 ee.setUnitOfWork(uow);
             }
 
-            // must suspend before we process the exchange
-            continuation.suspend();
-
             ClassLoader oldTccl = overrideTccl(exchange);
 
             if (log.isTraceEnabled()) {
@@ -251,8 +242,8 @@ public class CamelContinuationServlet extends CamelServlet {
                             log.trace("Resuming continuation of exchangeId: {}", exchange.getExchangeId());
                         }
                         // resume processing after both, sync and async callbacks
-                        continuation.setAttribute(EXCHANGE_ATTRIBUTE_NAME, exchange);
-                        continuation.resume();
+                        request.setAttribute(EXCHANGE_ATTRIBUTE_NAME, exchange);
+                        asyncContext.dispatch();
                     } else {
                         log.warn("Cannot resume expired continuation of exchangeId: {}", exchange.getExchangeId());
                         consumer.releaseExchange(exchange, false);
@@ -292,6 +283,43 @@ public class CamelContinuationServlet extends CamelServlet {
         }
     }
 
+    private boolean isInitial(HttpServletRequest request) {
+        return request.getDispatcherType() != DispatcherType.ASYNC;
+    }
+
+    private class ExpiredListener implements AsyncListener {
+
+        private HttpConsumer consumer;
+
+        public ExpiredListener(HttpConsumer consumer) {
+            this.consumer = consumer;
+        }
+
+        @Override
+        public void onComplete(AsyncEvent event) throws IOException {
+        }
+
+        @Override
+        public void onTimeout(AsyncEvent event) throws IOException {
+            HttpServletRequest request = (HttpServletRequest) event.getSuppliedRequest();
+            HttpServletResponse response = (HttpServletResponse) event.getSuppliedResponse();
+            String id = (String) request.getAttribute(EXCHANGE_ATTRIBUTE_ID);
+            // remember this id as expired
+            expiredExchanges.put(id, id);
+            log.warn("Continuation expired of exchangeId: {}", id);
+            consumer.getBinding().doWriteExceptionResponse(new TimeoutException(), response);
+            return;
+        }
+
+        @Override
+        public void onError(AsyncEvent event) throws IOException {
+        }
+
+        @Override
+        public void onStartAsync(AsyncEvent event) throws IOException {
+        }
+    }
+
     private void updateHttpPath(Exchange exchange, String contextPath) {
         String httpPath = (String) exchange.getIn().getHeader(JettyHttpConstants.HTTP_PATH);
         // encode context path in case it contains unsafe chars, because HTTP_PATH isn't decoded at this moment
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index 9bbb6b9ef80..126cef3ced4 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -26,6 +26,7 @@ import java.net.URISyntaxException;
 import java.security.GeneralSecurityException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.EventListener;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -73,8 +74,6 @@ import org.eclipse.jetty.jmx.MBeanContainer;
 import org.eclipse.jetty.server.AbstractConnector;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Handler;
-import org.eclipse.jetty.server.HttpConnectionFactory;
-import org.eclipse.jetty.server.MultiPartFormDataCompliance;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
@@ -591,7 +590,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent
     protected Connector createConnector(Server server, JettyHttpEndpoint endpoint) {
 
         // now we just use the SelectChannelConnector as the default connector
-        SslContextFactory sslcf = null;
+        SslContextFactory.Server sslcf = null;
 
         // Note that this was set on the endpoint when it was constructed.  It was
         // either explicitly set at the component or on the endpoint, but either way,
@@ -601,12 +600,12 @@ public abstract class JettyHttpComponent extends HttpCommonComponent
 
         if (endpointSslContextParameters != null) {
             try {
-                sslcf = createSslContextFactory(endpointSslContextParameters, false);
+                sslcf = (SslContextFactory.Server) createSslContextFactory(endpointSslContextParameters, false);
             } catch (Exception e) {
                 throw new RuntimeCamelException(e);
             }
         } else if ("https".equals(endpoint.getProtocol())) {
-            sslcf = new SslContextFactory();
+            sslcf = new SslContextFactory.Server();
             sslcf.setEndpointIdentificationAlgorithm(null);
             String keystoreProperty = System.getProperty(JETTY_SSL_KEYSTORE);
             if (keystoreProperty != null) {
@@ -634,7 +633,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent
     }
 
     protected abstract AbstractConnector createConnectorJettyInternal(
-            Server server, JettyHttpEndpoint endpoint, SslContextFactory sslcf);
+            Server server, JettyHttpEndpoint endpoint, SslContextFactory.Server sslcf);
 
     private SslContextFactory createSslContextFactory(SSLContextParameters ssl, boolean client)
             throws GeneralSecurityException, IOException {
@@ -1177,16 +1176,6 @@ public abstract class JettyHttpComponent extends HttpCommonComponent
         // use rest enabled resolver in case we use rest
         camelServlet.setServletResolveConsumerStrategy(new HttpRestServletResolveConsumerStrategy());
 
-        //must make RFC7578 as default to avoid using the deprecated MultiPartInputStreamParser
-        try {
-            connector.getConnectionFactory(HttpConnectionFactory.class).getHttpConfiguration()
-                    .setMultiPartFormDataCompliance(MultiPartFormDataCompliance.RFC7578);
-        } catch (Exception e) {
-            // ignore this due to OSGi problems
-            LOG.debug("Cannot set MultiPartFormDataCompliance to RFC7578 due to {}. This exception is ignored.",
-                    e.getMessage(), e);
-        }
-
         return camelServlet;
     }
 
@@ -1344,7 +1333,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent
 
         try {
             Object o = getContainer(server);
-            o.getClass().getMethod("addEventListener", Container.Listener.class).invoke(o, mbContainer);
+            o.getClass().getMethod("addEventListener", EventListener.class).invoke(o, mbContainer);
             mbContainer.getClass().getMethod("beanAdded", Container.class, Object.class)
                     .invoke(mbContainer, null, server);
         } catch (RuntimeException rex) {
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/MultiPartFilter.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/MultiPartFilter.java
index fd03e944f8e..4c68b43588e 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/MultiPartFilter.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/MultiPartFilter.java
@@ -28,7 +28,7 @@ import jakarta.servlet.ServletResponse;
 import jakarta.servlet.http.HttpServletRequest;
 
 /**
- * To enable handle attachments with Jetty 9 when this filter is set.
+ * To enable handle attachments with Jetty 10 when this filter is set.
  * <p/>
  * To replace the deprecated org.eclipse.jetty.servlets.MultiPartFilter Tell AttachmentHttpBinding to use Servlet 3
  * HttpServletRequest.getParts API
diff --git a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriFactory.java b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty11/JettyHttp11EndpointUriFactory.java
similarity index 94%
rename from components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriFactory.java
rename to components/camel-jetty/src/generated/java/org/apache/camel/component/jetty11/JettyHttp11EndpointUriFactory.java
index f5efcfcb92b..3719fa36932 100644
--- a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriFactory.java
+++ b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty11/JettyHttp11EndpointUriFactory.java
@@ -1,5 +1,5 @@
 /* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.jetty9;
+package org.apache.camel.component.jetty11;
 
 import java.net.URISyntaxException;
 import java.util.Collections;
@@ -13,7 +13,7 @@ import org.apache.camel.spi.EndpointUriFactory;
 /**
  * Generated by camel build tools - do NOT edit this file!
  */
-public class JettyHttp9EndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+public class JettyHttp11EndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
 
     private static final String BASE = ":httpUri";
 
diff --git a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttpComponent9Configurer.java b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty11/JettyHttpComponent11Configurer.java
similarity index 96%
rename from components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttpComponent9Configurer.java
rename to components/camel-jetty/src/generated/java/org/apache/camel/component/jetty11/JettyHttpComponent11Configurer.java
index 8211d97dbd2..05c18e26a37 100644
--- a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttpComponent9Configurer.java
+++ b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty11/JettyHttpComponent11Configurer.java
@@ -1,25 +1,20 @@
 /* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.jetty9;
-
-import java.util.Map;
+package org.apache.camel.component.jetty11;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
 import org.apache.camel.spi.PropertyConfigurerGetter;
-import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
 /**
  * Generated by camel build tools - do NOT edit this file!
  */
 @SuppressWarnings("unchecked")
-public class JettyHttpComponent9Configurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
+public class JettyHttpComponent11Configurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
-        JettyHttpComponent9 target = (JettyHttpComponent9) obj;
+        JettyHttpComponent11 target = (JettyHttpComponent11) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "allowjavaserializedobject":
         case "allowJavaSerializedObject": target.setAllowJavaSerializedObject(property(camelContext, boolean.class, value)); return true;
@@ -164,7 +159,7 @@ public class JettyHttpComponent9Configurer extends PropertyConfigurerSupport imp
 
     @Override
     public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
-        JettyHttpComponent9 target = (JettyHttpComponent9) obj;
+        JettyHttpComponent11 target = (JettyHttpComponent11) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "allowjavaserializedobject":
         case "allowJavaSerializedObject": return target.isAllowJavaSerializedObject();
diff --git a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9Configurer.java b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty11/JettyHttpEndpoint11Configurer.java
similarity index 96%
rename from components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9Configurer.java
rename to components/camel-jetty/src/generated/java/org/apache/camel/component/jetty11/JettyHttpEndpoint11Configurer.java
index 104821f1cb9..feda3ea6d58 100644
--- a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9Configurer.java
+++ b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty11/JettyHttpEndpoint11Configurer.java
@@ -1,25 +1,20 @@
 /* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.jetty9;
-
-import java.util.Map;
+package org.apache.camel.component.jetty11;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
 import org.apache.camel.spi.PropertyConfigurerGetter;
-import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
 /**
  * Generated by camel build tools - do NOT edit this file!
  */
 @SuppressWarnings("unchecked")
-public class JettyHttpEndpoint9Configurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
+public class JettyHttpEndpoint11Configurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
-        JettyHttpEndpoint9 target = (JettyHttpEndpoint9) obj;
+        JettyHttpEndpoint11 target = (JettyHttpEndpoint11) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "async": target.setAsync(property(camelContext, boolean.class, value)); return true;
         case "bridgeerrorhandler":
@@ -154,7 +149,7 @@ public class JettyHttpEndpoint9Configurer extends PropertyConfigurerSupport impl
 
     @Override
     public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
-        JettyHttpEndpoint9 target = (JettyHttpEndpoint9) obj;
+        JettyHttpEndpoint11 target = (JettyHttpEndpoint11) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "async": return target.isAsync();
         case "bridgeerrorhandler":
diff --git a/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/component/jetty b/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/component/jetty
index 18fd1ba8f0f..f9173c15d3b 100644
--- a/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/component/jetty
+++ b/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/component/jetty
@@ -1,2 +1,2 @@
 # Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.jetty9.JettyHttpComponent9
+class=org.apache.camel.component.jetty11.JettyHttpComponent11
diff --git a/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/configurer/jetty-component b/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/configurer/jetty-component
index 1f0792cf87c..8f8c8ce9386 100644
--- a/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/configurer/jetty-component
+++ b/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/configurer/jetty-component
@@ -1,2 +1,2 @@
 # Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.jetty9.JettyHttpComponent9Configurer
+class=org.apache.camel.component.jetty11.JettyHttpComponent11Configurer
diff --git a/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/configurer/jetty-endpoint b/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/configurer/jetty-endpoint
index d8a0689b558..d12e3c31a80 100644
--- a/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/configurer/jetty-endpoint
+++ b/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/configurer/jetty-endpoint
@@ -1,2 +1,2 @@
 # Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.jetty9.JettyHttpEndpoint9Configurer
+class=org.apache.camel.component.jetty11.JettyHttpEndpoint11Configurer
diff --git a/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/send-dynamic/jetty b/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/send-dynamic/jetty
index ca555990bee..d8f7c765168 100644
--- a/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/send-dynamic/jetty
+++ b/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/send-dynamic/jetty
@@ -1,2 +1,2 @@
 # Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.jetty9.HttpSendDynamicAware
+class=org.apache.camel.component.jetty11.HttpSendDynamicAware
diff --git a/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/urifactory/jetty-endpoint b/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/urifactory/jetty-endpoint
index c66b1220ece..d5b6af1a82f 100644
--- a/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/urifactory/jetty-endpoint
+++ b/components/camel-jetty/src/generated/resources/META-INF/services/org/apache/camel/urifactory/jetty-endpoint
@@ -1,2 +1,2 @@
 # Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.jetty9.JettyHttp9EndpointUriFactory
+class=org.apache.camel.component.jetty11.JettyHttp11EndpointUriFactory
diff --git a/components/camel-jetty/src/generated/resources/org/apache/camel/component/jetty9/jetty.json b/components/camel-jetty/src/generated/resources/org/apache/camel/component/jetty11/jetty.json
similarity index 99%
rename from components/camel-jetty/src/generated/resources/org/apache/camel/component/jetty9/jetty.json
rename to components/camel-jetty/src/generated/resources/org/apache/camel/component/jetty11/jetty.json
index 2cd2c2c9d24..c57bdc9e4a9 100644
--- a/components/camel-jetty/src/generated/resources/org/apache/camel/component/jetty9/jetty.json
+++ b/components/camel-jetty/src/generated/resources/org/apache/camel/component/jetty11/jetty.json
@@ -3,12 +3,12 @@
     "kind": "component",
     "name": "jetty",
     "title": "Jetty",
-    "description": "Expose HTTP endpoints using Jetty 9.",
+    "description": "Expose HTTP endpoints using Jetty 11.",
     "deprecated": false,
     "deprecationNote": "",
     "firstVersion": "1.2.0",
     "label": "http",
-    "javaType": "org.apache.camel.component.jetty9.JettyHttpComponent9",
+    "javaType": "org.apache.camel.component.jetty11.JettyHttpComponent11",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jetty",
diff --git a/components/camel-jetty/src/main/docs/jetty-component.adoc b/components/camel-jetty/src/main/docs/jetty-component.adoc
index 90ae00c0dae..09abeb1a900 100644
--- a/components/camel-jetty/src/main/docs/jetty-component.adoc
+++ b/components/camel-jetty/src/main/docs/jetty-component.adoc
@@ -2,7 +2,7 @@
 :doctitle: Jetty
 :shortname: jetty
 :artifactid: camel-jetty
-:description: Expose HTTP endpoints using Jetty 9.
+:description: Expose HTTP endpoints using Jetty 11.
 :since: 1.2
 :supportlevel: Stable
 :component-header: Only consumer is supported
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/AttachmentHttpBinding.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty11/AttachmentHttpBinding.java
similarity index 94%
rename from components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/AttachmentHttpBinding.java
rename to components/camel-jetty/src/main/java/org/apache/camel/component/jetty11/AttachmentHttpBinding.java
index bfb5288ac61..76bc38275d6 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/AttachmentHttpBinding.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty11/AttachmentHttpBinding.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.jetty9;
+package org.apache.camel.component.jetty11;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -37,13 +37,14 @@ import org.apache.camel.component.jetty.MultiPartFilter;
 import org.apache.camel.http.common.DefaultHttpBinding;
 import org.apache.camel.http.common.HttpHelper;
 import org.apache.camel.http.common.HttpMessage;
+import org.eclipse.jetty.http.HttpFields;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * To handle attachments with Jetty 9.
+ * To handle attachments with Jetty 11.
  * <p/>
- * This implementation is needed to deal with attachments when using Jetty 9.
+ * This implementation is needed to deal with attachments when using Jetty 11.
  */
 final class AttachmentHttpBinding extends DefaultHttpBinding {
     private static final Logger LOG = LoggerFactory.getLogger(AttachmentHttpBinding.class);
@@ -92,7 +93,9 @@ final class AttachmentHttpBinding extends DefaultHttpBinding {
         // remove Content-Encoding from request
         if (request instanceof org.eclipse.jetty.server.Request) {
             org.eclipse.jetty.server.Request jettyRequest = (org.eclipse.jetty.server.Request) request;
-            jettyRequest.getHttpFields().remove(Exchange.CONTENT_ENCODING);
+            HttpFields originalFields = jettyRequest.getHttpFields();
+            HttpFields newFields = HttpFields.build(originalFields).remove(Exchange.CONTENT_ENCODING);
+            jettyRequest.setHttpFields(newFields);
         }
 
         // attachment is optional
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty11/CamelInputStreamContentProvider.java
similarity index 96%
rename from components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
rename to components/camel-jetty/src/main/java/org/apache/camel/component/jetty11/CamelInputStreamContentProvider.java
index 1b1cf7ea4a9..9f00e15d100 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/CamelInputStreamContentProvider.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty11/CamelInputStreamContentProvider.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.jetty9;
+package org.apache.camel.component.jetty11;
 
 import java.io.InputStream;
 
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/HttpSendDynamicAware.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty11/HttpSendDynamicAware.java
similarity index 95%
rename from components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/HttpSendDynamicAware.java
rename to components/camel-jetty/src/main/java/org/apache/camel/component/jetty11/HttpSendDynamicAware.java
index eee06bc1e06..66572c26318 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/HttpSendDynamicAware.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty11/HttpSendDynamicAware.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.jetty9;
+package org.apache.camel.component.jetty11;
 
 import org.apache.camel.spi.annotations.SendDynamic;
 
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyContentExchange9.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty11/JettyContentExchange11.java
similarity index 98%
rename from components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyContentExchange9.java
rename to components/camel-jetty/src/main/java/org/apache/camel/component/jetty11/JettyContentExchange11.java
index 2ca5924fc18..f03b5724e34 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyContentExchange9.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty11/JettyContentExchange11.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.jetty9;
+package org.apache.camel.component.jetty11;
 
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
@@ -55,9 +55,9 @@ import org.slf4j.LoggerFactory;
 /**
  * Jetty specific exchange which keeps track of the request and response.
  */
-public class JettyContentExchange9 implements JettyContentExchange {
+public class JettyContentExchange11 implements JettyContentExchange {
 
-    private static final Logger LOG = LoggerFactory.getLogger(JettyContentExchange9.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JettyContentExchange11.class);
 
     private volatile Exchange exchange;
     private volatile AsyncCallback callback;
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty11/JettyHttpComponent11.java
similarity index 96%
rename from components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
rename to components/camel-jetty/src/main/java/org/apache/camel/component/jetty11/JettyHttpComponent11.java
index d7ef71f8962..a26829a0578 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpComponent9.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty11/JettyHttpComponent11.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.jetty9;
+package org.apache.camel.component.jetty11;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -40,20 +40,20 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @Component("jetty")
-public class JettyHttpComponent9 extends JettyHttpComponent {
+public class JettyHttpComponent11 extends JettyHttpComponent {
 
     public static Map<String, Throwable> connectorCreation = new ConcurrentHashMap<>();
 
-    private static final Logger LOG = LoggerFactory.getLogger(JettyHttpComponent9.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JettyHttpComponent11.class);
 
     @Override
     protected JettyHttpEndpoint createEndpoint(URI endpointUri, URI httpUri) throws URISyntaxException {
-        return new JettyHttpEndpoint9(this, endpointUri.toString(), httpUri);
+        return new JettyHttpEndpoint11(this, endpointUri.toString(), httpUri);
     }
 
     @Override
     protected AbstractConnector createConnectorJettyInternal(
-            Server server, JettyHttpEndpoint endpoint, SslContextFactory sslcf) {
+            Server server, JettyHttpEndpoint endpoint, SslContextFactory.Server sslcf) {
         try {
             String host = endpoint.getHttpUri().getHost();
             int port = endpoint.getPort();
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty11/JettyHttpEndpoint11.java
similarity index 88%
rename from components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java
rename to components/camel-jetty/src/main/java/org/apache/camel/component/jetty11/JettyHttpEndpoint11.java
index 52157b962bc..c9bf0722764 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty11/JettyHttpEndpoint11.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.jetty9;
+package org.apache.camel.component.jetty11;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -30,24 +30,24 @@ import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriEndpoint;
 
 /**
- * Expose HTTP endpoints using Jetty 9.
+ * Expose HTTP endpoints using Jetty 10.
  */
 @UriEndpoint(firstVersion = "1.2.0", scheme = "jetty", extendsScheme = "http", title = "Jetty", syntax = "jetty:httpUri",
              category = { Category.HTTP }, consumerOnly = true, lenientProperties = true,
              headersClass = JettyHttpConstants.class)
 @Metadata(excludeProperties = "authMethod,authMethodPriority,authUsername,authPassword,authDomain,authHost"
                               + "proxyAuthScheme,proxyAuthMethod,proxyAuthUsername,proxyAuthPassword,proxyAuthHost,proxyAuthPort,proxyAuthDomain")
-public class JettyHttpEndpoint9 extends JettyHttpEndpoint implements AsyncEndpoint {
+public class JettyHttpEndpoint11 extends JettyHttpEndpoint implements AsyncEndpoint {
 
     private HttpBinding binding;
 
-    public JettyHttpEndpoint9(JettyHttpComponent component, String uri, URI httpURL) throws URISyntaxException {
+    public JettyHttpEndpoint11(JettyHttpComponent component, String uri, URI httpURL) throws URISyntaxException {
         super(component, uri, httpURL);
     }
 
     @Override
     public HttpBinding getHttpBinding() {
-        // make sure we include jetty9 variant of the http binding
+        // make sure we include jetty10 variant of the http binding
         if (this.binding == null) {
             this.binding = new AttachmentHttpBinding();
             this.binding.setTransferException(isTransferException());
@@ -72,6 +72,6 @@ public class JettyHttpEndpoint9 extends JettyHttpEndpoint implements AsyncEndpoi
 
     @Override
     public JettyContentExchange createContentExchange() {
-        return new JettyContentExchange9();
+        return new JettyContentExchange11();
     }
 }
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyComponentMuteExceptionTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyComponentMuteExceptionTest.java
index 509587b1e13..668a7dfbe04 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyComponentMuteExceptionTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyComponentMuteExceptionTest.java
@@ -17,7 +17,7 @@
 package org.apache.camel.component.jetty;
 
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.jetty9.JettyHttpComponent9;
+import org.apache.camel.component.jetty11.JettyHttpComponent11;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
@@ -48,8 +48,8 @@ public class JettyComponentMuteExceptionTest extends BaseJettyTest {
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             @Override
-            public void configure() {
-                JettyHttpComponent9 jc = context.getComponent("jetty", JettyHttpComponent9.class);
+            public void configure() throws Exception {
+                JettyHttpComponent11 jc = context.getComponent("jetty", JettyHttpComponent11.class);
                 jc.setMuteException(true);
 
                 from("jetty:http://localhost:{{port}}/foo").to("mock:destination")
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpEndpointDisconnectTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpEndpointDisconnectTest.java
index 258f2a329e1..319ea1da8eb 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpEndpointDisconnectTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyHttpEndpointDisconnectTest.java
@@ -20,8 +20,7 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.jetty9.JettyHttpComponent9;
-import org.eclipse.jetty.util.Jetty;
+import org.apache.camel.component.jetty11.JettyHttpComponent11;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Isolated;
 
@@ -42,7 +41,7 @@ public class JettyHttpEndpointDisconnectTest extends BaseJettyTest {
                 () -> {
                     StringBuilder sb = new StringBuilder("Connector should have been removed\n");
                     for (String key : JettyHttpComponent.CONNECTORS.keySet()) {
-                        Throwable t = JettyHttpComponent9.connectorCreation.get(key);
+                        Throwable t = JettyHttpComponent11.connectorCreation.get(key);
                         if (t == null) {
                             t = new Throwable("Unable to find connector creation");
                         }
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/TwoCamelContextWithJettyRouteTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/TwoCamelContextWithJettyRouteTest.java
index 1461cef7330..af86ce4f996 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/TwoCamelContextWithJettyRouteTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/TwoCamelContextWithJettyRouteTest.java
@@ -37,9 +37,9 @@ public class TwoCamelContextWithJettyRouteTest extends BaseJettyTest {
         CamelContext contextB = new DefaultCamelContext();
         contextB.addRoutes(new RouteBuilder() {
             @Override
-            public void configure() {
+            public void configure() throws Exception {
                 from("jetty://http://localhost:" + port2 + "/myotherapp").process(new Processor() {
-                    public void process(Exchange exchange) {
+                    public void process(Exchange exchange) throws Exception {
                         String in = exchange.getIn().getBody(String.class);
                         exchange.getMessage().setBody("Hi " + in);
                     }
@@ -65,16 +65,16 @@ public class TwoCamelContextWithJettyRouteTest extends BaseJettyTest {
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() {
+    protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             @Override
-            public void configure() {
+            public void configure() throws Exception {
                 from("direct:a").to("http://localhost:" + port1 + "/myapp");
 
                 from("direct:b").to("http://localhost:" + port2 + "/myotherapp");
 
                 from("jetty://http://localhost:" + port1 + "/myapp").process(new Processor() {
-                    public void process(Exchange exchange) {
+                    public void process(Exchange exchange) throws Exception {
                         String in = exchange.getIn().getBody(String.class);
                         exchange.getMessage().setBody("Bye " + in);
                     }
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncContinuationTimeoutTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncContinuationTimeoutTest.java
index 4b09b772b9b..5afab1f976b 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncContinuationTimeoutTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncContinuationTimeoutTest.java
@@ -49,7 +49,7 @@ public class JettyAsyncContinuationTimeoutTest extends BaseJettyTest {
             long taken = watch.taken();
 
             HttpOperationFailedException cause = assertIsInstanceOf(HttpOperationFailedException.class, e.getCause());
-            assertEquals(504, cause.getStatusCode());
+            assertEquals(500, cause.getStatusCode());
 
             // should be approx 3-4 sec.
             assertTrue(taken < 4500, "Timeout should occur faster than " + taken);
diff --git a/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/JettyComponentSpringConfiguredTest.xml b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/JettyComponentSpringConfiguredTest.xml
index a67186f1068..28dea64c3df 100644
--- a/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/JettyComponentSpringConfiguredTest.xml
+++ b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/JettyComponentSpringConfiguredTest.xml
@@ -24,7 +24,7 @@
        http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-	<bean id="jetty2" class="org.apache.camel.component.jetty9.JettyHttpComponent9">
+	<bean id="jetty2" class="org.apache.camel.component.jetty11.JettyHttpComponent11">
 		<property name="enableJmx" value="true"/>
 		<property name="minThreads" value="10"/>
 		<property name="maxThreads" value="50"/>
diff --git a/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-https.xml b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-https.xml
index 1228a21ae06..e57e1646c5c 100644
--- a/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-https.xml
+++ b/components/camel-jetty/src/test/resources/org/apache/camel/component/jetty/jetty-https.xml
@@ -23,7 +23,7 @@
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
        http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
-    <bean id="jetty" class="org.apache.camel.component.jetty9.JettyHttpComponent9">
+    <bean id="jetty" class="org.apache.camel.component.jetty11.JettyHttpComponent11">
         <property name="sslPassword" value="changeit"/>
         <property name="sslKeyPassword" value="changeit"/>
         <property name="keystore" value="src/test/resources/jsse/localhost.p12"/>
diff --git a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
index 94a418a60a3..92b4837412f 100644
--- a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
+++ b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/JettySpanDecorator.java
@@ -25,7 +25,7 @@ public class JettySpanDecorator extends AbstractHttpSpanDecorator {
 
     @Override
     public String getComponentClassName() {
-        return "org.apache.camel.component.jetty9.JettyHttpComponent9";
+        return "org.apache.camel.component.jetty10.JettyHttpComponent10";
     }
 
 }
diff --git a/test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyEmbeddedService.java b/test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyEmbeddedService.java
index bffe10568bd..9dade4d1621 100644
--- a/test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyEmbeddedService.java
+++ b/test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyEmbeddedService.java
@@ -54,7 +54,7 @@ public class JettyEmbeddedService implements JettyService, BeforeEachCallback, A
         ServerConnector connector;
         SSLContext sslContext = jettyConfiguration.getSslContext();
         if (sslContext != null) {
-            SslContextFactory sslContextFactory = new SslContextFactory.Server();
+            SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
             sslContextFactory.setSslContext(sslContext);
 
             connector = new ServerConnector(server, new SslConnectionFactory(sslContextFactory, null));


[camel] 06/08: Switch javax packages to jakarta

Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch jakarta-rewritten
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 26ca1b929bc03d0ecfd19207235dc50989eabc67
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Nov 25 22:04:54 2022 +0100

    Switch javax packages to jakarta
---
 .../src/main/java/MyRoutes.java                    |   2 +-
 .../src/main/java/SomeBean.java                    |   4 +-
 .../camel/parser/java/MyCdiConcatRouteBuilder.java |   2 +-
 .../camel/parser/java/MyCdiRouteBuilder.java       |   2 +-
 .../converter/ActiveMQMessageConverterLoader.java  |   4 +-
 .../component/activemq/ActiveMQConfiguration.java  |   2 +-
 .../OriginalDestinationPropagateStrategy.java      |   4 +-
 .../converter/ActiveMQMessageConverter.java        |   6 +-
 .../activemq/ActiveMQJmsHeaderRouteTest.java       |   2 +-
 .../activemq/ActiveMQOriginalDestinationTest.java  |   2 +-
 .../ActiveMQReplyToHeaderUsingConverterTest.java   |   2 +-
 .../activemq/AdvisoryConsumerExampleTest.java      |   2 +-
 .../activemq/CamelVMTransportRoutingTest.java      |  12 +--
 .../apache/camel/component/activemq/DlqTest.java   |   8 +-
 ...nvokeRequestReplyUsingJmsReplyToHeaderTest.java |   2 +-
 .../apache/camel/component/activemq/JmsBridge.java |  12 +--
 .../activemq/JmsConsumeSendTransacted.java         |  12 +--
 .../component/activemq/JmsJdbcXARollbackTest.java  |  14 +--
 .../camel/component/activemq/JmsJdbcXATest.java    |   8 +-
 .../activemq/JmsSimpleRequestReplyTest.java        |   2 +-
 .../component/activemq/ObjectMessageTest.java      |  10 +-
 .../component/activemq/PoisonJMSPayloadTest.java   |  12 +--
 .../component/activemq/TransactedConsumeTest.java  |   8 +-
 .../component/activemq/converter/ConsumerBean.java |   4 +-
 .../converter/InvokeJmsMessageListenerTest.java    |   6 +-
 .../converter/InvokeMessageListenerTest.java       |   4 +-
 .../apache/camel/component/amqp/AMQPComponent.java |   2 +-
 .../camel/component/amqp/AMQPConfiguration.java    |   2 +-
 .../camel/component/amqp/AMQPJmsBinding.java       |   2 +-
 .../apache/camel/component/amqp/AMQPRouteTest.java |  12 +--
 .../websocket/CamelWebSocketServlet.java           |   8 +-
 .../atmosphere/websocket/WebsocketConsumer.java    |   8 +-
 .../apache/camel/component/atom/MyHttpServlet.java |   6 +-
 .../attachment/AttachmentConverterLoader.java      |   2 +-
 .../org/apache/camel/attachment/Attachment.java    |   2 +-
 .../camel/attachment/AttachmentConverter.java      |   2 +-
 .../apache/camel/attachment/AttachmentMessage.java |   4 +-
 .../camel/attachment/CamelFileDataSource.java      |   4 +-
 .../apache/camel/attachment/DefaultAttachment.java |   4 +-
 .../camel/attachment/DefaultAttachmentMessage.java |   2 +-
 .../attachment/BeanMethodWithExchangeTest.java     |   4 +-
 .../camel/attachment/BodyAndHeaderConvertTest.java |   4 +-
 .../MessageWithAttachmentRedeliveryIssueTest.java  |   4 +-
 .../org/apache/camel/attachment/WireTapTest.java   |   4 +-
 .../camel/component/aws2/ses/Ses2Producer.java     |   4 +-
 .../camel/component/aws2/ses/MockMessage.java      |  12 +--
 .../BeanValidatorComponentConfigurer.java          |  20 ++--
 .../validator/BeanValidatorEndpointConfigurer.java |  20 ++--
 .../bean/validator/BeanValidationException.java    |   2 +-
 .../bean/validator/BeanValidatorComponent.java     |  10 +-
 .../bean/validator/BeanValidatorEndpoint.java      |  12 +--
 .../bean/validator/BeanValidatorProducer.java      |   4 +-
 .../HibernateValidationProviderResolver.java       |   2 +-
 .../ValidationProviderResolverFactory.java         |   2 +-
 .../bean/validator/ValidatorFactories.java         |  18 ++--
 .../validator/BeanValidatorConfigurationTest.java  |  12 +--
 .../bean/validator/BeanValidatorRouteTest.java     |   6 +-
 .../bean/validator/CarWithAnnotations.java         |   4 +-
 .../validator/CarWithRedefinedDefaultGroup.java    |   6 +-
 .../CustomValidationProviderResolverTest.java      |   4 +-
 .../HibernateValidationProviderResolverTest.java   |   2 +-
 .../component/bean/validator/OrderedChecks.java    |   4 +-
 .../validator/ValidatorFactoryAutowireTest.java    |   6 +-
 .../validator/ValidatorFactoryRegistryTest.java    |   6 +-
 .../camel/component/bonita/api/BonitaAPI.java      |   8 +-
 .../component/bonita/api/BonitaAPIBuilder.java     |   6 +-
 .../bonita/api/filter/BonitaAuthFilter.java        |  22 ++---
 .../bonita/api/filter/JsonClientFilter.java        |   6 +-
 .../component/bonita/api/util/BonitaAPIUtil.java   |  10 +-
 .../api/BonitaAuthFilterAlreadyConnectedTest.java  |   4 +-
 .../bonita/api/BonitaAuthFilterConnectionTest.java |   6 +-
 .../component/bonita/api/BonitaAuthFilterTest.java |   4 +-
 .../transaction/MandatoryJtaTransactionPolicy.java |   2 +-
 .../transaction/NestedJtaTransactionPolicy.java    |   4 +-
 .../cdi/transaction/NeverJtaTransactionPolicy.java |   2 +-
 .../NotSupportedJtaTransactionPolicy.java          |   4 +-
 .../transaction/RequiredJtaTransactionPolicy.java  |   2 +-
 .../RequiresNewJtaTransactionPolicy.java           |   4 +-
 .../transaction/SupportsJtaTransactionPolicy.java  |   2 +-
 .../TransactionalJtaTransactionPolicy.java         |  14 +--
 .../src/main/java/org/apache/camel/cdi/Main.java   |  14 +--
 .../org/apache/camel/cdi/AnnotatedDelegate.java    |   4 +-
 .../apache/camel/cdi/AnnotatedMemberDelegate.java  |   6 +-
 .../apache/camel/cdi/AnnotatedMethodDelegate.java  |   6 +-
 .../apache/camel/cdi/AnnotatedTypeDelegate.java    |  10 +-
 .../apache/camel/cdi/ApplicationScopedLiteral.java |   4 +-
 .../java/org/apache/camel/cdi/BeanDelegate.java    |   8 +-
 .../org/apache/camel/cdi/BeanManagerHelper.java    |   4 +-
 .../apache/camel/cdi/CamelBeanInjectionTarget.java |  10 +-
 .../camel/cdi/CamelContextInjectionTarget.java     |   6 +-
 .../org/apache/camel/cdi/CamelContextProducer.java |  22 ++---
 .../camel/cdi/CdiCamelBeanPostProcessor.java       |   2 +-
 .../apache/camel/cdi/CdiCamelBeanRepository.java   |   6 +-
 .../camel/cdi/CdiCamelConfigurationEvent.java      |   2 +-
 .../org/apache/camel/cdi/CdiCamelEnvironment.java  |   8 +-
 .../org/apache/camel/cdi/CdiCamelExtension.java    |  48 +++++-----
 .../java/org/apache/camel/cdi/CdiCamelFactory.java |  14 +--
 .../org/apache/camel/cdi/CdiCamelInjector.java     |   4 +-
 .../org/apache/camel/cdi/CdiEventComponent.java    |   4 +-
 .../org/apache/camel/cdi/CdiEventConsumer.java     |   2 +-
 .../org/apache/camel/cdi/CdiEventEndpoint.java     |  16 ++--
 .../org/apache/camel/cdi/CdiEventNotifier.java     |   4 +-
 .../org/apache/camel/cdi/CdiEventProducer.java     |   4 +-
 .../java/org/apache/camel/cdi/CdiSpiHelper.java    |  22 ++---
 .../apache/camel/cdi/DelegateInjectionTarget.java  |   6 +-
 .../org/apache/camel/cdi/DelegateProducer.java     |   6 +-
 .../main/java/org/apache/camel/cdi/Excluded.java   |   4 +-
 .../apache/camel/cdi/ForwardingObserverMethod.java |   8 +-
 .../java/org/apache/camel/cdi/ImportResource.java  |   2 +-
 .../apache/camel/cdi/ListParameterizedType.java    |   2 +-
 .../java/org/apache/camel/cdi/NamedLiteral.java    |   4 +-
 .../main/java/org/apache/camel/cdi/Startup.java    |   4 +-
 .../org/apache/camel/cdi/SyntheticAnnotated.java   |   2 +-
 .../java/org/apache/camel/cdi/SyntheticBean.java   |  18 ++--
 .../apache/camel/cdi/SyntheticBeanAttributes.java  |   8 +-
 .../apache/camel/cdi/SyntheticInjectionTarget.java |   6 +-
 .../src/main/java/org/apache/camel/cdi/Uri.java    |   6 +-
 .../camel/cdi/bean/CamelContextAwareBean.java      |   2 +-
 .../camel/cdi/bean/CamelContextProducerMethod.java |   6 +-
 .../apache/camel/cdi/bean/ConsumeMethodBean.java   |   4 +-
 .../cdi/bean/CustomLifecycleCamelContext.java      |   8 +-
 .../cdi/bean/CustomPropertiesCamelContext.java     |   4 +-
 .../camel/cdi/bean/DefaultCamelContextBean.java    |   4 +-
 .../apache/camel/cdi/bean/EventConsumingRoute.java |   4 +-
 .../camel/cdi/bean/EventConsumingRouteCdi10.java   |   4 +-
 .../apache/camel/cdi/bean/EventProducingRoute.java |   4 +-
 .../camel/cdi/bean/EventProducingRouteCdi10.java   |   4 +-
 .../camel/cdi/bean/FirstCamelContextBean.java      |   2 +-
 .../cdi/bean/FirstCamelContextConvertingRoute.java |   2 +-
 .../bean/FirstCamelContextEndpointInjectRoute.java |   4 +-
 .../bean/FirstCamelContextEventConsumingRoute.java |   4 +-
 .../bean/FirstCamelContextEventProducingRoute.java |   4 +-
 .../camel/cdi/bean/FirstCamelContextRoute.java     |   2 +-
 .../camel/cdi/bean/FirstNamedCamelContextBean.java |   4 +-
 .../cdi/bean/FirstNamedCamelContextRoute.java      |   2 +-
 .../camel/cdi/bean/InjectedEndpointRoute.java      |   2 +-
 .../camel/cdi/bean/ManualStartupCamelContext.java  |   6 +-
 .../apache/camel/cdi/bean/MockAnnotationRoute.java |   2 +-
 .../org/apache/camel/cdi/bean/NamedCamelBean.java  |   2 +-
 .../camel/cdi/bean/RecipientListMethodBean.java    |   2 +-
 .../camel/cdi/bean/SecondCamelContextBean.java     |   6 +-
 .../bean/SecondCamelContextConvertingRoute.java    |   4 +-
 .../SecondCamelContextEventConsumingRoute.java     |   6 +-
 .../SecondCamelContextEventProducingRoute.java     |   6 +-
 .../cdi/bean/SecondNamedCamelContextBean.java      |   4 +-
 .../cdi/bean/SecondNamedCamelContextRoute.java     |   4 +-
 .../apache/camel/cdi/bean/SimpleCamelRoute.java    |   2 +-
 .../apache/camel/cdi/bean/UriEndpointRoute.java    |   2 +-
 .../cdi/converter/InjectedTestTypeConverter.java   |   2 +-
 .../apache/camel/cdi/qualifier/BarQualifier.java   |   4 +-
 .../apache/camel/cdi/qualifier/FooQualifier.java   |   4 +-
 .../org/apache/camel/cdi/qualifier/Manual.java     |   2 +-
 .../cdi/routetemplate/MyRouteCreatorBean.java      |   6 +-
 .../camel/cdi/routetemplate/RouteTemplateTest.java |   2 +-
 .../cdi/templatedroute/TemplatedRouteTest.java     |   2 +-
 .../cdi/test/AdvisedMockEndpointProducerTest.java  |   2 +-
 .../apache/camel/cdi/test/AdvisedRouteTest.java    |   8 +-
 .../org/apache/camel/cdi/test/BeanInjectTest.java  |   8 +-
 .../org/apache/camel/cdi/test/Camel9973Test.java   |   8 +-
 .../camel/cdi/test/CamelContextAwareTest.java      |   2 +-
 .../cdi/test/CamelContextProducerFieldTest.java    |   8 +-
 .../cdi/test/CamelContextProducerMethodTest.java   |   2 +-
 .../camel/cdi/test/CamelEventEndpointTest.java     |   2 +-
 .../camel/cdi/test/CamelEventNotifierTest.java     |   8 +-
 .../cdi/test/CamelRouteEventNotifierTest.java      |   8 +-
 .../camel/cdi/test/CdiCamelConfigurationTest.java  |   4 +-
 .../apache/camel/cdi/test/ConsumeMethodTest.java   |   2 +-
 .../camel/cdi/test/ConsumerTemplateTest.java       |   2 +-
 .../camel/cdi/test/ContextComponentTest.java       |   2 +-
 .../camel/cdi/test/CustomCamelContextTest.java     |   2 +-
 .../camel/cdi/test/DefaultCamelContextTest.java    |   2 +-
 .../cdi/test/DefaultProducerTemplateTest.java      |   2 +-
 .../camel/cdi/test/DeploymentDescriptorTest.java   |   2 +-
 .../apache/camel/cdi/test/EndpointInjectTest.java  |   2 +-
 .../apache/camel/cdi/test/EventComponentTest.java  |   2 +-
 .../camel/cdi/test/EventEndpointCdi12Test.java     |  12 +--
 .../apache/camel/cdi/test/EventEndpointTest.java   |  10 +-
 .../camel/cdi/test/InjectedEndpointTest.java       |   2 +-
 .../camel/cdi/test/InjectedTypeConverterTest.java  |   6 +-
 .../camel/cdi/test/ManualCamelContextTest.java     |   2 +-
 .../apache/camel/cdi/test/MockEndpointTest.java    |   2 +-
 .../camel/cdi/test/NamedCamelContextTest.java      |   8 +-
 .../apache/camel/cdi/test/NoCamelContextTest.java  |   6 +-
 .../org/apache/camel/cdi/test/NoTCCLSetTest.java   |   4 +-
 .../camel/cdi/test/ProgrammaticLookupTest.java     |   6 +-
 .../camel/cdi/test/PropertiesLocationTest.java     |   6 +-
 .../camel/cdi/test/PropertyEndpointTest.java       |   8 +-
 .../apache/camel/cdi/test/PropertyInjectTest.java  |   6 +-
 .../camel/cdi/test/QualifiedCamelContextTest.java  |   4 +-
 .../camel/cdi/test/RawEventEndpointCdi12Test.java  |   8 +-
 .../camel/cdi/test/RecipientListMethodTest.java    |   2 +-
 .../camel/cdi/test/UndefinedPropertyTest.java      |   6 +-
 .../cdi/test/UnstoppedCamelContextBeanTest.java    |   2 +-
 .../UnstoppedCamelContextProducerFieldTest.java    |   4 +-
 .../UnstoppedCamelContextProducerMethodTest.java   |   4 +-
 .../org/apache/camel/cdi/test/UriEndpointTest.java |   2 +-
 .../cdi/test/UriQualifierWithContextTest.java      |   4 +-
 .../camel/cdi/test/UriWithWrongContextTest.java    |   4 +-
 .../org/apache/camel/component/cm/CMComponent.java |   8 +-
 .../apache/camel/component/cm/CMConfiguration.java |   8 +-
 .../org/apache/camel/component/cm/CMProducer.java  |   4 +-
 .../camel/component/cm/client/SMSMessage.java      |   6 +-
 .../component/cm/validation/constraints/E164.java  |   4 +-
 .../cm/validation/constraints/E164Validator.java   |   4 +-
 .../component/cm/test/CMConfigurationTest.java     |   4 +-
 .../camel/component/cm/test/SMSMessageTest.java    |   4 +-
 .../camel/component/cometd/CometdComponent.java    |   2 +-
 .../cxf/converter/CxfConverterLoader.java          |   8 +-
 .../camel/component/cxf/common/CxfBinding.java     |   4 +-
 .../component/cxf/common/message/CxfConstants.java |   4 +-
 .../component/cxf/converter/CxfConverter.java      |   4 +-
 .../component/cxf/util/ReaderInputStream.java      |   2 +-
 .../component/cxf/jaxrs/CxfConverterLoader.java    |  12 +--
 .../camel/component/cxf/jaxrs/CxfConverter.java    |   6 +-
 .../camel/component/cxf/jaxrs/CxfRsBinding.java    |  10 +-
 .../camel/component/cxf/jaxrs/CxfRsInvoker.java    |  10 +-
 .../camel/component/cxf/jaxrs/CxfRsProducer.java   |  14 +--
 .../component/cxf/jaxrs/DataFormatProvider.java    |  14 +--
 .../component/cxf/jaxrs/DefaultCxfRsBinding.java   |  12 +--
 .../component/cxf/jaxrs/DefaultModelResource.java  |   4 +-
 .../component/cxf/jaxrs/SimpleCxfRsBinding.java    |  24 ++---
 .../component/cxf/jaxrs/CustomExceptionMapper.java |   4 +-
 .../CxfRsBindingConfigurationSelectionTest.java    |   4 +-
 .../cxf/jaxrs/CxfRsConvertBodyToTest.java          |   2 +-
 .../jaxrs/CxfRsProducerEndpointConfigurerTest.java |   2 +-
 .../jaxrs/CxfRsProducerHttpMethodHeaderTest.java   |   2 +-
 .../cxf/jaxrs/DataFormatProviderTest.java          |   2 +-
 .../CxfRsConsumerSimpleBindingImplTest.java        |   2 +-
 .../CxfRsConsumerSimpleBindingTest.java            |   4 +-
 .../cxf/jaxrs/simplebinding/testbean/Customer.java |   2 +-
 .../jaxrs/simplebinding/testbean/CustomerList.java |   2 +-
 .../simplebinding/testbean/CustomerService.java    |  18 ++--
 .../testbean/CustomerServiceImpl.java              |   4 +-
 .../testbean/CustomerServiceResource.java          |  18 ++--
 .../simplebinding/testbean/MultipartCustomer.java  |  12 +--
 .../cxf/jaxrs/simplebinding/testbean/Order.java    |   8 +-
 .../cxf/jaxrs/simplebinding/testbean/Product.java  |   2 +-
 .../testbean/VipCustomerResource.java              |  14 +--
 .../component/cxf/jaxrs/testbean/Customer.java     |   2 +-
 .../cxf/jaxrs/testbean/CustomerService.java        |  18 ++--
 .../jaxrs/testbean/CustomerServiceResource.java    |  14 +--
 .../component/cxf/jaxrs/testbean/EchoService.java  |  14 +--
 .../camel/component/cxf/jaxrs/testbean/Order.java  |   8 +-
 .../component/cxf/jaxrs/testbean/Product.java      |   2 +-
 .../cxf/feature/CXFMessageDataFormatFeature.java   |   2 +-
 .../CxfMessageSoapHeaderOutInterceptor.java        |   2 +-
 .../camel/component/cxf/jaxws/CxfConsumer.java     |   6 +-
 .../camel/component/cxf/jaxws/CxfEndpoint.java     |   6 +-
 .../component/cxf/jaxws/CxfEndpointUtils.java      |   4 +-
 .../camel/component/cxf/jaxws/CxfProducer.java     |   4 +-
 .../component/cxf/jaxws/DefaultCxfBinding.java     |   6 +-
 .../cxf/jaxws/DefaultPayloadProviderSEI.java       |   8 +-
 .../camel/component/cxf/jaxws/DefaultSEI.java      |  12 +--
 .../cxf/jaxws/WSDLServiceFactoryBean.java          |   2 +-
 .../cxf/holder/CxfHolderConsumerTest.java          |   2 +-
 .../component/cxf/holder/MyOrderEndpoint.java      |  10 +-
 .../camel/component/cxf/holder/MyOrderType.java    |   6 +-
 .../camel/component/cxf/holder/MyProcessor.java    |   2 +-
 ...XFWsdlOnlyPayloadModeMultiPartNoSpringTest.java |   6 +-
 .../CXFWsdlOnlyPayloadModeNoSpringSoap12Test.java  |   2 +-
 .../jaxws/CXFWsdlOnlyPayloadModeNoSpringTest.java  |   6 +-
 .../jaxws/CxfConsumerPayLoadMarshalFaultTest.java  |   2 +-
 .../cxf/jaxws/CxfConsumerPayloadFaultTest.java     |   4 +-
 .../cxf/jaxws/CxfConsumerResponseTest.java         |   2 +-
 .../camel/component/cxf/jaxws/CxfConsumerTest.java |   2 +-
 .../cxf/jaxws/CxfPayLoadBareSoapTest.java          |   6 +-
 .../cxf/jaxws/CxfPayLoadSoapHeaderTest.java        |   2 +-
 .../jaxws/CxfPayLoadSoapHeaderTestAbstract.java    |   2 +-
 .../cxf/jaxws/CxfProducerContextTest.java          |   2 +-
 .../cxf/jaxws/CxfProducerSoapFaultTest.java        |   2 +-
 .../camel/component/cxf/jaxws/CxfProducerTest.java |   4 +-
 .../cxf/jaxws/CxfSchemaValidationTest.java         |   6 +-
 .../component/cxf/jaxws/DefaultCxfBindingTest.java |   4 +-
 .../camel/component/cxf/jaxws/EchoService.java     |   2 +-
 .../cxf/jaxws/EchoServiceSessionImpl.java          |  12 +--
 .../component/cxf/jaxws/ParameterProcessor.java    |   2 +-
 .../camel/component/cxf/jaxws/ServiceProvider.java |   8 +-
 .../component/cxf/jaxws/SoapMessageProvider.java   |  10 +-
 .../camel/component/cxf/jaxws/SoapTargetBean.java  |   6 +-
 .../cxf/multipart/MultiPartInvokeImpl.java         |   4 +-
 .../component/cxf/noparam/NoParamEndpoint.java     |   4 +-
 .../cxf/soap/headers/HeaderTesterImpl.java         |  16 ++--
 .../headers/HeaderTesterWithInsertionImpl.java     |   8 +-
 .../camel/component/cxf/wsdl/OrderEndpoint.java    |   4 +-
 .../apache/camel/wsdl_first/JaxwsTestHandler.java  |   6 +-
 .../org/apache/camel/wsdl_first/PersonImpl.java    |   4 +-
 .../org/apache/camel/wsdl_first/PersonImpl12.java  |   4 +-
 .../camel/wsdl_first/PersonImplWithWsdl.java       |   4 +-
 .../camel/wsdl_first/PersonMultiPartImpl.java      |   2 +-
 .../apache/camel/wsdl_first/PersonProcessor.java   |   2 +-
 .../component/cxf/jaxrs/CustomExceptionMapper.java |   4 +-
 .../cxf/jaxrs/CxfRsAsyncProducerTest.java          |   2 +-
 .../component/cxf/jaxrs/CxfRsConsumerTest.java     |  20 ++--
 .../cxf/jaxrs/CxfRsProducerHeaderTest.java         |   2 +-
 .../component/cxf/jaxrs/CxfRsProducerTest.java     |   2 +-
 .../CxfRsConsumerSimpleBindingImplTest.java        |   2 +-
 .../CxfRsConsumerSimpleBindingTest.java            |   4 +-
 .../cxf/jaxrs/simplebinding/testbean/Customer.java |   2 +-
 .../jaxrs/simplebinding/testbean/CustomerList.java |   2 +-
 .../simplebinding/testbean/CustomerService.java    |  18 ++--
 .../testbean/CustomerServiceImpl.java              |   4 +-
 .../testbean/CustomerServiceResource.java          |  18 ++--
 .../simplebinding/testbean/MultipartCustomer.java  |  12 +--
 .../cxf/jaxrs/simplebinding/testbean/Order.java    |   8 +-
 .../cxf/jaxrs/simplebinding/testbean/Product.java  |   2 +-
 .../testbean/VipCustomerResource.java              |  14 +--
 .../component/cxf/jaxrs/testbean/Customer.java     |   2 +-
 .../cxf/jaxrs/testbean/CustomerService.java        |  18 ++--
 .../jaxrs/testbean/CustomerServiceResource.java    |  14 +--
 .../component/cxf/jaxrs/testbean/EchoService.java  |  14 +--
 .../camel/component/cxf/jaxrs/testbean/Order.java  |   8 +-
 .../component/cxf/jaxrs/testbean/Product.java      |   2 +-
 .../cxf/spring/jaxws/CxfSpringEndpoint.java        |   2 +-
 .../cxf/spring/jaxws/CxfSpringEndpointUtils.java   |   4 +-
 .../cxf/AbstractCXFGreeterRouterTest.java          |   2 +-
 .../component/cxf/AbstractCxfWsdlFirstTest.java    |   6 +-
 .../camel/component/cxf/CXFGreeterEnrichTest.java  |   2 +-
 .../camel/component/cxf/CXFGreeterRouterTest.java  |   2 +-
 .../camel/component/cxf/CXFWsdlOnlyTest.java       |   6 +-
 .../CxfConsumerPayloadFaultCauseEnabledTest.java   |   8 +-
 .../component/cxf/CxfDispatchTestSupport.java      |   2 +-
 .../cxf/CxfGreeterCXFMessageRouterTest.java        |   2 +-
 .../CxfGreeterCXFMessageWithoutSEIRouterTest.java  |   2 +-
 .../cxf/CxfGreeterConverterRouterTest.java         |   2 +-
 .../cxf/CxfGreeterMessageCamelHttpRouterTest.java  |   2 +-
 .../component/cxf/CxfGreeterMessageRouterTest.java |   2 +-
 .../component/cxf/CxfGreeterPayLoadRouterTest.java |   2 +-
 .../CxfGreeterPayLoadWithFeatureRouterTest.java    |   2 +-
 .../cxf/CxfGreeterWSDLOnlyRouterTest.java          |   2 +-
 .../component/cxf/CxfMessageHeaderTimeoutTest.java |   2 +-
 .../camel/component/cxf/CxfNonWrapperTest.java     |   2 +-
 .../camel/component/cxf/CxfOneWayRouteTest.java    |   2 +-
 .../cxf/CxfPayLoadSoapHeaderSpringTest.java        |   4 +-
 .../cxf/CxfPayLoadSoapHeaderTestAbstract.java      |   2 +-
 .../cxf/CxfPayloadProviderRouterTest.java          |   4 +-
 .../cxf/CxfPayloadRouterContentLengthTest.java     |   6 +-
 .../cxf/CxfPayloadWsdlWithoutSEITest.java          |   2 +-
 .../component/cxf/CxfSoapMessageProviderTest.java  |   2 +-
 .../apache/camel/component/cxf/CxfTimeoutTest.java |   2 +-
 .../component/cxf/CxfWsdlFirstPayloadModeTest.java |   2 +-
 .../component/cxf/CxfWsdlFirstProcessorTest.java   |   2 +-
 .../camel/component/cxf/CxfWsdlFirstTest.java      |   2 +-
 .../apache/camel/component/cxf/EchoService.java    |   2 +-
 .../component/cxf/EchoServiceSessionImpl.java      |  12 +--
 .../org/apache/camel/component/cxf/HelloImpl.java  |   6 +-
 .../camel/component/cxf/ParameterProcessor.java    |   2 +-
 .../camel/component/cxf/ServiceProvider.java       |   8 +-
 .../camel/component/cxf/SoapMessageProvider.java   |  10 +-
 .../apache/camel/component/cxf/SoapTargetBean.java |   6 +-
 .../component/cxf/holder/MyOrderEndpoint.java      |  10 +-
 .../camel/component/cxf/holder/MyOrderType.java    |   6 +-
 .../camel/component/cxf/holder/MyProcessor.java    |   2 +-
 .../cxf/mtom/CxfJavaMtomProducerPayloadTest.java   |   2 +-
 .../cxf/mtom/CxfMtomConsumerPayloadModeTest.java   |   4 +-
 .../component/cxf/mtom/CxfMtomConsumerTest.java    |   6 +-
 .../CxfMtomDisabledConsumerPayloadModeTest.java    |   4 +-
 .../CxfMtomDisabledProducerPayloadModeTest.java    |  14 +--
 .../cxf/mtom/CxfMtomPOJOProducerTest.java          |   6 +-
 .../cxf/mtom/CxfMtomProducerPayloadModeTest.java   |   8 +-
 .../cxf/mtom/CxfMtomRouterCxfMessageModeTest.java  |   2 +-
 .../cxf/mtom/CxfMtomRouterPayloadMode12Test.java   |   2 +-
 .../cxf/mtom/CxfMtomRouterPayloadModeTest.java     |   8 +-
 .../cxf/mtom/CxfMtomRouterRawModeTest.java         |   2 +-
 .../apache/camel/component/cxf/mtom/HelloImpl.java |   2 +-
 .../camel/component/cxf/mtom/HelloImpl12.java      |   6 +-
 .../component/cxf/multipart/CXFMultiPartTest.java  |   8 +-
 .../cxf/multipart/MultiPartInvokeImpl.java         |   4 +-
 .../component/cxf/noparam/NoParamEndpoint.java     |   4 +-
 .../soap/headers/CxfMessageHeadersRelayTest.java   |  12 +--
 .../cxf/soap/headers/HeaderTesterImpl.java         |  16 ++--
 .../headers/HeaderTesterWithInsertionImpl.java     |   8 +-
 .../camel/component/cxf/wsdl/OrderEndpoint.java    |   4 +-
 .../camel/component/cxf/wsrm/HelloWorld.java       |   2 +-
 .../cxf/wssecurity/camel/WSSecurityRouteTest.java  |   2 +-
 .../cxf/wssecurity/server/GreeterImpl.java         |   2 +-
 .../apache/camel/wsdl_first/JaxwsTestHandler.java  |   6 +-
 .../org/apache/camel/wsdl_first/PersonImpl.java    |   4 +-
 .../org/apache/camel/wsdl_first/PersonImpl12.java  |   4 +-
 .../camel/wsdl_first/PersonImplWithWsdl.java       |   4 +-
 .../camel/wsdl_first/PersonMultiPartImpl.java      |   2 +-
 .../apache/camel/wsdl_first/PersonProcessor.java   |   2 +-
 .../message/DefaultCxfMessageMapperTest.java       |   2 +-
 .../cxf/transport/CamelDestinationTest.java        |   6 +-
 .../cxf/transport/JaxWSCamelDestinationTest.java   |   2 +-
 .../cxf/transport/JaxWSCamelTestSupport.java       |  16 ++--
 .../transport/message/DefaultCxfMessageMapper.java |   2 +-
 .../message/DefaultCxfMessageMapperTest.java       |   2 +-
 .../cxf/transport/JaxWSCamelDestinationTest.java   |   2 +-
 .../cxf/transport/JaxWSCamelTestSupport.java       |  16 ++--
 .../camel/converter/dozer/MapperFactory.java       |   2 +-
 .../component/dozer/example/abc/ABCOrder.java      |  12 +--
 .../component/dozer/example/abc/ObjectFactory.java |   2 +-
 .../freemarker/FreemarkerAttachmentsTest.java      |   4 +-
 .../google/mail/GmailUsersMessagesIT.java          |   8 +-
 .../component/google/mail/GmailUsersThreadsIT.java |   8 +-
 .../sheets/server/GoogleSheetsApiTestServer.java   |  18 ++--
 .../camel/http/common/HttpConverterLoader.java     |  10 +-
 .../org/apache/camel/http/common/CamelServlet.java |  14 +--
 .../camel/http/common/DefaultHttpBinding.java      |   8 +-
 .../camel/http/common/DefaultHttpRegistry.java     |   2 +-
 .../org/apache/camel/http/common/HttpBinding.java  |   8 +-
 .../camel/http/common/HttpCommonEndpoint.java      |   4 +-
 .../apache/camel/http/common/HttpConverter.java    |   6 +-
 .../org/apache/camel/http/common/HttpHelper.java   |   4 +-
 .../org/apache/camel/http/common/HttpMessage.java  |   4 +-
 .../HttpRestServletResolveConsumerStrategy.java    |   2 +-
 .../common/HttpServletResolveConsumerStrategy.java |   2 +-
 .../common/ServletResolveConsumerStrategy.java     |   8 +-
 .../http/handler/SessionReflectionHandler.java     |   8 +-
 .../camel/component/jackson/TestJAXBPojo.java      |   4 +-
 .../camel/component/jackson/converter/Order.java   |   8 +-
 .../camel/component/jacksonxml/TestJAXBPojo.java   |   4 +-
 .../converter/jaxb/FallbackTypeConverter.java      |  12 +--
 .../camel/converter/jaxb/JaxbDataFormat.java       |  18 ++--
 .../apache/camel/converter/jaxb/JaxbHelper.java    |   2 +-
 .../converter/jaxb/JaxbNamespacePrefixMapper.java  |   2 +-
 .../jaxb/JaxbDataFormatMultipleNamespacesTest.java |   2 +-
 .../JaxbDataFormatSchemaValidationSpringTest.java  |  12 +--
 .../jaxb/JaxbDataFormatSchemaValidationTest.java   |   4 +-
 ...ormatSchemaValidationWithObjectFactoryTest.java |  10 +-
 .../camel/converter/jaxb/address/Address.java      |   8 +-
 .../converter/jaxb/address/ObjectFactory.java      |   2 +-
 .../camel/converter/jaxb/address/package-info.java |   4 +-
 .../camel/converter/jaxb/message/Message.java      |   8 +-
 .../converter/jaxb/message/ObjectFactory.java      |   6 +-
 .../camel/converter/jaxb/message/package-info.java |   2 +-
 .../camel/converter/jaxb/person/ObjectFactory.java |   2 +-
 .../apache/camel/converter/jaxb/person/Person.java |  10 +-
 .../camel/converter/jaxb/person/package-info.java  |   4 +-
 .../java/org/apache/camel/example/Address.java     |   8 +-
 .../test/java/org/apache/camel/example/Bar.java    |   8 +-
 .../camel/example/DataFormatConcurrentTest.java    |   4 +-
 .../ExplicitEncodingAndXMLCharFilteringTest.java   |   4 +-
 .../camel/example/ExplicitFileEncodingTest.java    |   4 +-
 .../test/java/org/apache/camel/example/Foo.java    |  10 +-
 .../org/apache/camel/example/JaxbErrorLogTest.java |   2 +-
 .../test/java/org/apache/camel/example/Order.java  |   8 +-
 .../java/org/apache/camel/example/Partial.java     |  10 +-
 .../org/apache/camel/example/PurchaseOrder.java    |   8 +-
 .../test/java/org/apache/camel/example/Zot.java    |   6 +-
 .../org/apache/camel/example/package-info.java     |   4 +-
 .../org/apache/camel/foo/bar/ObjectFactory.java    |   6 +-
 .../java/org/apache/camel/foo/bar/PersonType.java  |  10 +-
 .../java/org/apache/camel/jaxb/CamelJaxbTest.java  |   2 +-
 .../apache/camel/jaxb/JaxbDataFormatIssueTest.java |   4 +-
 .../jaxb/JaxbDataFormatMustBeJAXBElementTest.java  |   6 +-
 .../org/apache/camel/jaxb/NotificationType.java    |  10 +-
 .../SplitterAndExceptionRouteTwistIssueTest.java   |  10 +-
 .../component/jclouds/JcloudsBlobStoreHelper.java  |   2 +-
 .../component/jetty/CamelContinuationServlet.java  |   6 +-
 .../camel/component/jetty/CamelFilterWrapper.java  |  16 ++--
 .../component/jetty/CamelMultipartFilter.java      |   2 +-
 .../camel/component/jetty/JettyHttpComponent.java  |  14 +--
 .../camel/component/jetty/JettyHttpEndpoint.java   |   2 +-
 .../component/jetty/JettyRestHttpBinding.java      |   2 +-
 .../camel/component/jetty/MultiPartFilter.java     |  14 +--
 .../jetty9/JettyHttpEndpoint9Configurer.java       |   6 +-
 .../component/jetty9/AttachmentHttpBinding.java    |   8 +-
 .../camel/component/jetty/CustomFiltersTest.java   |  14 +--
 .../jetty/ExplicitJettyAsyncRouteTest.java         |   2 +-
 .../component/jetty/ExplicitJettyRouteTest.java    |   2 +-
 .../jetty/HttpAuthMethodPriorityTest.java          |   2 +-
 .../HttpBasicAuthComponentConfiguredTest.java      |   2 +-
 .../camel/component/jetty/HttpBasicAuthTest.java   |   2 +-
 .../camel/component/jetty/HttpBindingRefTest.java  |   2 +-
 .../camel/component/jetty/HttpConverterTest.java   |   6 +-
 .../component/jetty/HttpGZipEncodingTest.java      |   2 +-
 .../camel/component/jetty/HttpHeaderTest.java      |   2 +-
 .../component/jetty/HttpRequestResponseTest.java   |   4 +-
 .../camel/component/jetty/HttpRouteTest.java       |   2 +-
 .../camel/component/jetty/JettyRouteTest.java      |   2 +-
 .../jetty/JettyRouteWithSocketPropertiesTest.java  |   2 +-
 .../camel/component/jetty/MultiPartFormTest.java   |   2 +-
 .../jetty/MultiPartFormWithCustomFilterTest.java   |  12 +--
 .../camel/component/jetty/MyErrorHandler.java      |   2 +-
 .../component/jetty/SpringHttpsRouteTest.java      |   2 +-
 .../component/jetty/rest/MyCustomHttpBinding.java  |   2 +-
 .../camel/component/jetty/rest/MyLoginService.java |   2 +-
 .../camel/component/jetty/rest/UserJaxbPojo.java   |   8 +-
 .../component/jms/JmsComponentConfigurer.java      |   8 +-
 .../camel/component/jms/JmsEndpointConfigurer.java |   8 +-
 .../component/jms/DefaultQueueBrowseStrategy.java  |   8 +-
 .../camel/component/jms/DestinationEndpoint.java   |   6 +-
 .../component/jms/EndpointMessageListener.java     |  12 +--
 .../component/jms/InOnlyMessageSentCallback.java   |   6 +-
 .../org/apache/camel/component/jms/JmsBinding.java |  26 ++---
 .../camel/component/jms/JmsBrowsableEndpoint.java  |   4 +-
 .../apache/camel/component/jms/JmsComponent.java   |   6 +-
 .../camel/component/jms/JmsConfiguration.java      |  40 ++++----
 .../apache/camel/component/jms/JmsConstants.java   |   6 +-
 .../apache/camel/component/jms/JmsConsumer.java    |   4 +-
 .../apache/camel/component/jms/JmsEndpoint.java    |   8 +-
 .../camel/component/jms/JmsKeyFormatStrategy.java  |   4 +-
 .../org/apache/camel/component/jms/JmsMessage.java |  14 +--
 .../camel/component/jms/JmsMessageHelper.java      |  12 +--
 .../apache/camel/component/jms/JmsMessageType.java |   2 +-
 .../camel/component/jms/JmsPollingConsumer.java    |   2 +-
 .../apache/camel/component/jms/JmsProducer.java    |  16 ++--
 .../camel/component/jms/JmsProviderMetadata.java   |   4 +-
 .../component/jms/JmsTemporaryQueueEndpoint.java   |   8 +-
 .../component/jms/JmsTemporaryTopicEndpoint.java   |   8 +-
 .../component/jms/MessageCreatedStrategy.java      |   6 +-
 .../camel/component/jms/MessageSentCallback.java   |   6 +-
 .../component/jms/StreamMessageInputStream.java    |   6 +-
 .../component/jms/reply/QueueReplyManager.java     |   8 +-
 .../camel/component/jms/reply/ReplyHandler.java    |   4 +-
 .../camel/component/jms/reply/ReplyHolder.java     |   4 +-
 .../camel/component/jms/reply/ReplyManager.java    |   6 +-
 .../component/jms/reply/ReplyManagerSupport.java   |   8 +-
 .../jms/reply/TemporaryQueueReplyHandler.java      |   4 +-
 .../jms/reply/TemporaryQueueReplyManager.java      |  12 +--
 ...essageIdAsCorrelationIdMessageSentCallback.java |   6 +-
 .../camel/component/jms/AbstractJMSTest.java       |   2 +-
 .../component/jms/AbstractPersistentJMSTest.java   |   2 +-
 .../jms/ActiveMQOriginalDestinationTest.java       |   4 +-
 .../camel/component/jms/CamelJmsTestHelper.java    |   2 +-
 .../component/jms/ConsumeJmsBytesMessageTest.java  |   4 +-
 .../component/jms/ConsumeJmsMapMessageTest.java    |   4 +-
 .../component/jms/ConsumeJmsObjectMessageTest.java |   4 +-
 .../component/jms/ConsumeMessageConverterTest.java |  10 +-
 .../jms/ConsumerTemplateJmsSelectorTest.java       |   2 +-
 .../component/jms/FromTextToBytesMessageTest.java  |  12 +--
 .../camel/component/jms/JmsAllowNullBodyTest.java  |   2 +-
 .../component/jms/JmsAsyncStartListenerTest.java   |   2 +-
 .../jms/JmsAsyncStartStopListenerTest.java         |   2 +-
 .../camel/component/jms/JmsClientAckTest.java      |   4 +-
 .../camel/component/jms/JmsComponentTest.java      |   2 +-
 .../jms/JmsDefaultTaskExecutorTypeTest.java        |   2 +-
 .../jms/JmsEndpointConfigurationTest.java          |   4 +-
 .../jms/JmsFormatDateHeadersToIso8601Test.java     |   2 +-
 .../jms/JmsInOnlyInvalidDestinationTest.java       |   6 +-
 .../component/jms/JmsInOutNonPersistentTest.java   |   2 +-
 .../component/jms/JmsLoadBalanceFailoverTest.java  |   2 +-
 .../JmsMessageCreatedStrategyComponentTest.java    |   6 +-
 .../jms/JmsMessageCreatedStrategyEndpointTest.java |   6 +-
 .../jms/JmsMessageIDNotOverridenAMQTest.java       |   6 +-
 .../jms/JmsProducerWithJMSHeaderTest.java          |   2 +-
 .../jms/JmsRequestReplyCorrelationTest.java        |   2 +-
 .../jms/JmsRequestReplyManualReplyTest.java        |   6 +-
 .../JmsRequestReplyManualWithJMSReplyToTest.java   |   2 +-
 .../jms/JmsRequestReplyReplyToOverrideTest.java    |   2 +-
 .../jms/JmsRouteDeliveryModePreserveQoSTest.java   |   2 +-
 .../component/jms/JmsRouteRequestReplyTest.java    |   2 +-
 .../camel/component/jms/JmsSelectorTest.java       |   2 +-
 .../apache/camel/component/jms/JmsSessionTest.java |   2 +-
 .../jms/JmsSimpleRequestLateReplyTest.java         |   2 +-
 .../jms/JmsTestConnectionOnStartupTest.java        |   2 +-
 .../jms/JmsThrottlingInflightRoutePolicyTest.java  |   2 +-
 .../component/jms/JmsTransactedRouteTest.java      |   2 +-
 .../component/jms/ManagedJmsSelectorTest.java      |   2 +-
 .../camel/component/jms/MapJmsMessageTest.java     |   4 +-
 .../camel/component/jms/MyDestinationResolver.java |   6 +-
 .../component/jms/ProduceMessageConverterTest.java |   8 +-
 .../jms/issues/JmsAnotherCustomJMSReplyToTest.java |   6 +-
 .../issues/JmsBlockedAsyncRoutingEngineTest.java   |   2 +-
 .../issues/JmsConcurrentConsumerInOnlyTest.java    |   2 +-
 .../jms/issues/JmsCustomJMSReplyToIssueTest.java   |   6 +-
 ...derKeyFormatIssueWithContentTypeHeaderTest.java |   2 +-
 .../JmsJMSReplyToEndpointUsingInOutTest.java       |   6 +-
 .../component/jms/issues/JmsMutateMessageTest.java |   4 +-
 .../issues/JmsMutateRemoveHeaderMessageTest.java   |   4 +-
 ...etterChannelHandlerRollbackOnExceptionTest.java |   2 +-
 ...ansactedOnExceptionRollbackOnExceptionTest.java |   2 +-
 .../component/jms/issues/TempReplyToIssueTest.java |   2 +-
 ...tReplyTemporaryRefreshFailureOnStartupTest.java |   2 +-
 .../component/jmx/NotificationXmlFormatter.java    |   6 +-
 .../component/jpa/JpaComponentConfigurer.java      |   4 +-
 .../camel/component/jpa/JpaEndpointConfigurer.java |   4 +-
 .../component/jpa/DefaultTransactionStrategy.java  |   2 +-
 .../apache/camel/component/jpa/DeleteHandler.java  |   2 +-
 .../jpa/JpaCloseEntityManagerOnCompletion.java     |   2 +-
 .../apache/camel/component/jpa/JpaComponent.java   |   2 +-
 .../apache/camel/component/jpa/JpaConstants.java   |   2 +-
 .../apache/camel/component/jpa/JpaConsumer.java    |  18 ++--
 .../apache/camel/component/jpa/JpaEndpoint.java    |   6 +-
 .../org/apache/camel/component/jpa/JpaHelper.java  |   8 +-
 .../camel/component/jpa/JpaPollingConsumer.java    |  12 +--
 .../apache/camel/component/jpa/JpaProducer.java    |   6 +-
 .../apache/camel/component/jpa/QueryBuilder.java   |   4 +-
 .../apache/camel/component/jpa/QueryFactory.java   |   4 +-
 .../idempotent/jpa/JpaMessageIdRepository.java     |  10 +-
 .../processor/idempotent/jpa/MessageProcessed.java |  14 +--
 .../camel/component/jpa/AbstractJpaMethodTest.java |   2 +-
 .../camel/component/jpa/JpaComponentTest.java      |   6 +-
 .../camel/component/jpa/JpaEndpointTest.java       |   4 +-
 .../org/apache/camel/component/jpa/JpaTest.java    |   2 +-
 .../camel/component/jpa/JpaUsePersistTest.java     |   2 +-
 .../jpa/JpaWithNamedQueryAndParametersTest.java    |   2 +-
 .../camel/component/jpa/JpaWithNamedQueryTest.java |   2 +-
 .../java/org/apache/camel/examples/Address.java    |   6 +-
 .../java/org/apache/camel/examples/Customer.java   |  14 +--
 .../java/org/apache/camel/examples/MultiSteps.java |   8 +-
 .../test/java/org/apache/camel/examples/Order.java |   6 +-
 .../java/org/apache/camel/examples/SendEmail.java  |   6 +-
 .../org/apache/camel/examples/VersionedItem.java   |   8 +-
 .../camel/processor/jpa/AbstractJpaTest.java       |   4 +-
 .../jpa/FileConsumerJpaIdempotentTest.java         |   2 +-
 .../processor/jpa/JpaIdempotentConsumerTest.java   |   4 +-
 .../jpa/JpaPollingConsumerLockEntityTest.java      |   2 +-
 .../jpa/JpaProducerPassingEntityManagerTest.java   |   4 +-
 .../camel/processor/jpa/JpaProducerRemoveTest.java |   4 +-
 .../camel/processor/jpa/JpaRouteEndpointTest.java  |   2 +-
 .../jpa/MultipleJpaRouteEndpointTest.java          |   6 +-
 .../component/jsonb/JsonbDataFormatConfigurer.java |   2 +-
 .../camel/component/jsonb/JsonbDataFormat.java     |  12 +--
 .../component/jsonb/JsonbAttributeOrderTest.java   |   2 +-
 .../apache/camel/jta/TransactionErrorHandler.java  |   2 +-
 ...osoftExchangeOnlineOAuth2MailAuthenticator.java |   2 +-
 .../component/mail/MailComponentConfigurer.java    |   4 +-
 .../camel/component/mail/MailConvertersLoader.java |  16 ++--
 .../component/mail/MailEndpointConfigurer.java     |   8 +-
 ...AttachmentsContentTransferEncodingResolver.java |   2 +-
 .../camel/component/mail/DefaultAuthenticator.java |   4 +-
 .../component/mail/DefaultJavaMailSender.java      |  12 +--
 .../component/mail/DefaultMailUidGenerator.java    |   6 +-
 .../camel/component/mail/DelegatingDataSource.java |   2 +-
 .../camel/component/mail/JavaMailSender.java       |   8 +-
 .../camel/component/mail/MailAuthenticator.java    |   4 +-
 .../apache/camel/component/mail/MailBinding.java   |  32 +++----
 .../component/mail/MailBoxPostProcessAction.java   |   2 +-
 .../apache/camel/component/mail/MailComponent.java |   2 +-
 .../camel/component/mail/MailConfiguration.java    |  12 +--
 .../apache/camel/component/mail/MailConsumer.java  |  20 ++--
 .../camel/component/mail/MailConverters.java       |  12 +--
 .../apache/camel/component/mail/MailEndpoint.java  |   6 +-
 .../apache/camel/component/mail/MailMessage.java   |   4 +-
 .../apache/camel/component/mail/MailProducer.java  |   4 +-
 .../apache/camel/component/mail/MailSorter.java    |   8 +-
 .../camel/component/mail/MailUidGenerator.java     |   2 +-
 .../org/apache/camel/component/mail/MailUtils.java |   6 +-
 .../apache/camel/component/mail/NowSearchTerm.java |   8 +-
 .../camel/component/mail/SearchTermBuilder.java    |  30 +++---
 .../camel/component/mail/SimpleSearchTerm.java     |   2 +-
 .../mime/multipart/MimeMultipartDataFormat.java    |  30 +++---
 .../camel/component/mail/AuthenticatorTest.java    |  18 ++--
 .../mail/MailAttachmentDuplicateNamesTest.java     |   4 +-
 .../component/mail/MailAttachmentNamesTest.java    |  10 +-
 .../mail/MailAttachmentRedeliveryTest.java         |   4 +-
 .../camel/component/mail/MailAttachmentTest.java   |   4 +-
 .../mail/MailAttachmentsUmlautIssueTest.java       |   4 +-
 .../component/mail/MailBatchConsumerTest.java      |   8 +-
 ...MailBindingAttachmentDuplicateFileNameTest.java |  14 +--
 .../MailBindingAttachmentEncodedFilenameTest.java  |  18 ++--
 .../mail/MailBindingAttachmentFileTest.java        |  16 ++--
 .../component/mail/MailCommitOnCompletionTest.java |   8 +-
 .../mail/MailComponentRecipientSetTest.java        |   2 +-
 .../camel/component/mail/MailComponentTest.java    |   2 +-
 .../mail/MailConsumerAuthenticatorTest.java        |   6 +-
 .../mail/MailConsumerUnsupportedCharsetTest.java   |   8 +-
 .../mail/MailContentTypeResolverTest.java          |   4 +-
 .../camel/component/mail/MailContentTypeTest.java  |   4 +-
 .../camel/component/mail/MailConvertersTest.java   |   4 +-
 .../camel/component/mail/MailCopyToTest.java       |   8 +-
 .../component/mail/MailCustomContentTypeTest.java  |   2 +-
 .../component/mail/MailCustomMailSenderTest.java   |   4 +-
 .../mail/MailDoNotDeleteIfProcessFailsTest.java    |  10 +-
 .../camel/component/mail/MailFetchSizeTest.java    |   8 +-
 .../component/mail/MailFetchSizeZeroTest.java      |   8 +-
 .../component/mail/MailHtmlAttachmentTest.java     |   4 +-
 .../MailIdempotentRepositoryDuplicateTest.java     |   8 +-
 .../mail/MailIdempotentRepositoryTest.java         |   8 +-
 .../component/mail/MailMaxMessagesPerPollTest.java |   8 +-
 .../camel/component/mail/MailMessageTest.java      |  10 +-
 .../component/mail/MailMimeDecodeHeadersTest.java  |   2 +-
 .../camel/component/mail/MailMoveToTest.java       |  10 +-
 .../MailMultipleRecipientsUsingHeadersTest.java    |   2 +-
 .../component/mail/MailPollEnrichNoMailTest.java   |   4 +-
 .../camel/component/mail/MailPollEnrichTest.java   |   8 +-
 .../component/mail/MailPostProcessActionTest.java  |   8 +-
 .../mail/MailProcessOnlyUnseenMessagesTest.java    |  10 +-
 .../camel/component/mail/MailProducerTest.java     |  10 +-
 .../mail/MailRecipientsPipeIssueTest.java          |   2 +-
 .../camel/component/mail/MailRecipientsTest.java   |   2 +-
 .../camel/component/mail/MailReplyToTest.java      |   2 +-
 .../apache/camel/component/mail/MailRouteTest.java |   8 +-
 .../component/mail/MailSearchTermNotSpamTest.java  |   2 +-
 .../camel/component/mail/MailSearchTermTest.java   |  12 +--
 .../MailSearchTermUriConfigLast24HoursTest.java    |  10 +-
 .../mail/MailSearchTermUriConfigTest.java          |  10 +-
 .../mail/MailShutdownCompleteAllTasksTest.java     |   8 +-
 .../MailShutdownCompleteCurrentTaskOnlyTest.java   |   8 +-
 .../camel/component/mail/MailSortTermTest.java     |  10 +-
 .../component/mail/MailSortTermThreeTest.java      |  10 +-
 .../camel/component/mail/MailSortTermTwoTest.java  |  10 +-
 .../camel/component/mail/MailSorterTest.java       |   8 +-
 .../component/mail/MailSplitAttachmentsTest.java   |   4 +-
 .../mail/MailToMultipleEndpointsTest.java          |   2 +-
 .../component/mail/MailUsingCustomSessionTest.java |   4 +-
 .../camel/component/mail/MailUsingHeadersTest.java |   2 +-
 .../component/mail/MailUsingOwnComponentTest.java  |   2 +-
 .../component/mail/MimeMessageConsumeTest.java     |  28 +++---
 .../mail/MimeMultipartAlternativeTest.java         |   6 +-
 ...imeMultipartAlternativeWithContentTypeTest.java |   2 +-
 ...MultipartAlternativeWithLongerFilenameTest.java |   6 +-
 .../mail/MultipleDestinationConsumeTest.java       |  14 +--
 .../mail/NestedMimeMessageConsumeTest.java         |  12 +--
 .../camel/component/mail/RawMailMessageTest.java   |  10 +-
 .../component/mail/SearchTermBuilderTest.java      |   6 +-
 .../mail/SpringMailSplitAttachmentsTest.java       |   4 +-
 .../camel/component/mail/mock/MyMockStore.java     |   8 +-
 .../camel/component/mail/mock/MyMockTransport.java |   6 +-
 .../camel/component/mail/mock/MyPop3Store.java     |   6 +-
 .../multipart/MimeMultipartDataFormatTest.java     |   6 +-
 ...CamelMicroProfileHealthCheckRepositoryTest.java |   4 +-
 .../health/CamelMicroProfileHealthCheckTest.java   |   4 +-
 .../CamelMicroProfileHealthComponentsTest.java     |   4 +-
 .../CamelMicroProfileHealthConsumerTest.java       |   4 +-
 ...CamelMicroProfileHealthRegistryBindingTest.java |   4 +-
 ...MicroProfileHealthSupervisedRoutesMainTest.java |   6 +-
 .../health/CamelMicroProfileHealthTestHelper.java  |   8 +-
 .../health/CamelMicroProfileHealthTestSupport.java |   4 +-
 .../milo/client/MiloClientConfiguration.java       |   2 +-
 .../netty/http/NettyHttpProducerSessionTest.java   |   2 +-
 .../netty/http/SpringNettyHttpBasicAuthTest.java   |   2 +-
 .../netty/http/SpringNettyHttpSSLTest.java         |   2 +-
 .../component/netty/http/rest/UserJaxbPojo.java    |   8 +-
 .../olingo2/Olingo2AppAPIETagEnabledTest.java      |   2 +-
 .../http/vertx/VertxPlatformHttpConsumer.java      |   2 +-
 .../http/vertx/VertxPlatformHttpEngineTest.java    |   2 +-
 .../http/PlatformHttpHeaderFilterStrategy.java     |   2 +-
 .../http/JettyCustomPlatformHttpConsumer.java      |   4 +-
 .../camel/component/rest/openapi/HttpsTest.java    |   4 +-
 .../camel/component/rest/openapi/HttpsV3Test.java  |   4 +-
 .../apache/camel/component/rest/openapi/Pet.java   |   2 +-
 .../apache/camel/component/rest/openapi/Pets.java  |   8 +-
 .../rest/openapi/RestOpenApiComponentTest.java     |   4 +-
 .../rest/openapi/RestOpenApiComponentV3Test.java   |   4 +-
 .../openapi/RestOpenApiComponentV3YamlTest.java    |   4 +-
 .../rest/openapi/RestOpenApiComponentYamlTest.java |   4 +-
 .../camel/component/rest/swagger/HttpsTest.java    |   4 +-
 .../apache/camel/component/rest/swagger/Pet.java   |   2 +-
 .../apache/camel/component/rest/swagger/Pets.java  |   8 +-
 .../rest/swagger/RestSwaggerComponentTest.java     |   4 +-
 .../camel/component/resteasy/ResteasyProducer.java |  12 +--
 .../resteasy/servlet/ResteasyCamelServlet.java     |   8 +-
 .../component/resteasy/servlet/ResteasyFilter.java |  18 ++--
 .../servlet/ResteasyHttpServletRequestWrapper.java |   6 +-
 .../ResteasyHttpServletResponseWrapper.java        |   6 +-
 .../servlet/ResteasyServletInputStreamCopier.java  |   4 +-
 .../servlet/ResteasyServletOutputStreamCopier.java |   4 +-
 .../test/ResteasyConsumerMatchUriOnPrefix.java     |   2 +-
 .../resteasy/test/ResteasyConsumerProxyTest.java   |  12 +--
 .../resteasy/test/ResteasyConsumerTest.java        |  12 +--
 .../test/ResteasyConsumerTwoServletsTest.java      |   8 +-
 .../resteasy/test/ResteasyMethodRestrictTest.java  |   8 +-
 .../resteasy/test/ResteasyProducerTest.java        |   2 +-
 .../test/ResteasyRestDSLProxyCamelTest.java        |   8 +-
 .../resteasy/test/ResteasyRestDSLProxyTest.java    |   8 +-
 .../resteasy/test/ResteasyRestDSLTest.java         |   8 +-
 .../resteasy/test/ResteasySimpleConsumerTest.java  |   8 +-
 .../resteasy/test/ServletInitializerTest.java      |   2 +-
 .../component/resteasy/test/TestApplication.java   |   4 +-
 .../component/resteasy/test/TestResource.java      |  14 +--
 .../camel/component/resteasy/test/WebTest.java     |   2 +-
 .../resteasy/test/beans/CustomerService.java       |  20 ++--
 .../test/beans/ProxyProducerInterface.java         |  18 ++--
 .../resteasy/test/beans/ProxyServiceInterface.java |  10 +-
 .../test/beans/ResteasyProducerProxyTestApp.java   |   4 +-
 .../resteasy/test/beans/ServletOneService.java     |   6 +-
 .../resteasy/test/beans/ServletTwoService.java     |   6 +-
 .../resteasy/test/beans/SimpleService.java         |   6 +-
 .../resteasy/test/beans/SubresourceService.java    |   6 +-
 .../apache/camel/component/rss/MyHttpServlet.java  |   6 +-
 .../salesforce/api/dto/bulk/BatchInfo.java         |  10 +-
 .../salesforce/api/dto/bulk/BatchInfoList.java     |   6 +-
 .../salesforce/api/dto/bulk/BatchResult.java       |   6 +-
 .../salesforce/api/dto/bulk/BatchStateEnum.java    |   6 +-
 .../api/dto/bulk/ConcurrencyModeEnum.java          |   6 +-
 .../salesforce/api/dto/bulk/ContentType.java       |   4 +-
 .../component/salesforce/api/dto/bulk/Error.java   |   8 +-
 .../component/salesforce/api/dto/bulk/JobInfo.java |   8 +-
 .../salesforce/api/dto/bulk/JobStateEnum.java      |   6 +-
 .../salesforce/api/dto/bulk/ObjectFactory.java     |  20 ++--
 .../salesforce/api/dto/bulk/OperationEnum.java     |   6 +-
 .../salesforce/api/dto/bulk/QueryResult.java       |   8 +-
 .../salesforce/api/dto/bulk/QueryResultList.java   |   6 +-
 .../component/salesforce/api/dto/bulk/Result.java  |   6 +-
 .../salesforce/api/dto/bulk/ResultError.java       |   8 +-
 .../component/salesforce/api/dto/bulk/SObject.java |  10 +-
 .../salesforce/api/dto/bulk/StatusCode.java        |   4 +-
 .../salesforce/api/dto/bulk/package-info.java      |   4 +-
 .../internal/client/DefaultBulkApiClient.java      |  10 +-
 .../salesforce/HttpProxyIntegrationTest.java       |   4 +-
 .../salesforce/internal/streaming/StubServer.java  |   6 +-
 .../servicenow/AbstractServiceNowProcessor.java    |   4 +-
 .../component/servicenow/ServiceNowClient.java     |   4 +-
 .../ServiceNowComponentVerifierExtension.java      |   4 +-
 .../component/servicenow/ServiceNowHelper.java     |   4 +-
 .../servicenow/ServiceNowMetaDataExtension.java    |   8 +-
 .../auth/AuthenticationRequestFilter.java          |  12 +--
 .../fuji/FujiServiceNowAggregateProcessor.java     |   6 +-
 .../fuji/FujiServiceNowImportSetProcessor.java     |   6 +-
 .../fuji/FujiServiceNowTableProcessor.java         |   6 +-
 .../HelsinkiServiceNowAggregateProcessor.java      |   6 +-
 .../HelsinkiServiceNowAttachmentProcessor.java     |   6 +-
 .../HelsinkiServiceNowImportSetProcessor.java      |   8 +-
 .../helsinki/HelsinkiServiceNowMiscProcessor.java  |   6 +-
 .../HelsinkiServiceNowScorecardProcessor.java      |   6 +-
 ...inkiServiceNowServiceCatalogCartsProcessor.java |   6 +-
 ...erviceNowServiceCatalogCategoriesProcessor.java |   6 +-
 ...inkiServiceNowServiceCatalogItemsProcessor.java |   6 +-
 .../HelsinkiServiceNowServiceCatalogProcessor.java |   6 +-
 .../helsinki/HelsinkiServiceNowTableProcessor.java |   6 +-
 .../ServiceNowComponentVerifierExtensionIT.java    |   2 +-
 .../servicenow/ServiceNowComponentVerifierIT.java  |   2 +-
 .../component/servlet/AttachmentHttpBinding.java   |   6 +-
 .../servlet/CamelHttpTransportServlet.java         |   4 +-
 .../component/servlet/ServletRestHttpBinding.java  |   2 +-
 .../component/servlet/HttpClientRouteTest.java     |   4 +-
 .../camel/component/servlet/rest/UserJaxbPojo.java |   8 +-
 .../component/sjms/SjmsComponentConfigurer.java    |   8 +-
 .../component/sjms/SjmsEndpointConfigurer.java     |   8 +-
 .../component/sjms/MessageListenerContainer.java   |   4 +-
 .../camel/component/sjms/SessionCallback.java      |   4 +-
 .../component/sjms/SessionMessageListener.java     |   6 +-
 .../apache/camel/component/sjms/SjmsComponent.java |   6 +-
 .../apache/camel/component/sjms/SjmsConsumer.java  |   2 +-
 .../apache/camel/component/sjms/SjmsEndpoint.java  |  18 ++--
 .../apache/camel/component/sjms/SjmsHelper.java    |  20 ++--
 .../apache/camel/component/sjms/SjmsMessage.java   |  14 +--
 .../camel/component/sjms/SjmsPollingConsumer.java  |   2 +-
 .../apache/camel/component/sjms/SjmsProducer.java  |  14 +--
 .../apache/camel/component/sjms/SjmsTemplate.java  |  16 ++--
 .../component/sjms/TransactionOnCompletion.java    |   4 +-
 .../sjms/consumer/EndpointMessageListener.java     |  14 +--
 .../consumer/SimpleMessageListenerContainer.java   |  18 ++--
 .../jms/DefaultDestinationCreationStrategy.java    |   8 +-
 .../sjms/jms/DestinationCreationStrategy.java      |   6 +-
 .../component/sjms/jms/Jms11ObjectFactory.java     |  12 +--
 .../camel/component/sjms/jms/JmsBinding.java       |  28 +++---
 .../camel/component/sjms/jms/JmsConstants.java     |   2 +-
 .../component/sjms/jms/JmsKeyFormatStrategy.java   |   4 +-
 .../camel/component/sjms/jms/JmsMessageHelper.java |  14 +--
 .../camel/component/sjms/jms/JmsMessageType.java   |   2 +-
 .../camel/component/sjms/jms/JmsObjectFactory.java |   8 +-
 .../component/sjms/jms/MessageCreatedStrategy.java |   6 +-
 .../camel/component/sjms/jms/MessageCreator.java   |   6 +-
 .../sjms/jms/SessionAcknowledgementType.java       |   2 +-
 .../ExclusiveQueueMessageListenerContainer.java    |   8 +-
 .../component/sjms/reply/QueueReplyManager.java    |   8 +-
 .../camel/component/sjms/reply/ReplyHandler.java   |   4 +-
 .../camel/component/sjms/reply/ReplyHolder.java    |   4 +-
 .../camel/component/sjms/reply/ReplyManager.java   |   2 +-
 .../component/sjms/reply/ReplyManagerSupport.java  |   8 +-
 .../TemporaryQueueMessageListenerContainer.java    |   8 +-
 .../sjms/reply/TemporaryQueueReplyHandler.java     |   4 +-
 .../sjms/reply/TemporaryQueueReplyManager.java     |  12 +--
 .../camel/component/sjms/CamelJmsTestHelper.java   |   2 +-
 .../component/sjms/ReconnectInOutProducerTest.java |  12 +--
 .../component/sjms/ReconnectProducerTest.java      |   6 +-
 .../DefaultDestinationCreationStrategyTest.java    |   8 +-
 .../sjms/producer/InOnlyQueueProducerTest.java     |   6 +-
 .../sjms/producer/InOnlyTopicProducerTest.java     |   6 +-
 .../producer/InOutQueueProducerAsyncLoadTest.java  |  12 +--
 .../producer/InOutQueueProducerSyncLoadTest.java   |  12 +--
 .../sjms/producer/InOutQueueProducerTest.java      |  12 +--
 .../sjms/producer/InOutTempQueueProducerTest.java  |  12 +--
 .../sjms/producer/QueueProducerQoSTest.java        |   4 +-
 .../component/sjms/producer/QueueProducerTest.java |   6 +-
 .../component/sjms/support/JmsTestSupport.java     |   6 +-
 .../component/sjms/support/MockConnection.java     |   4 +-
 .../sjms/support/MockConnectionFactory.java        |   4 +-
 .../sjms/support/MockMessageConsumer.java          |   8 +-
 .../camel/component/sjms/support/MockSession.java  |  12 +--
 .../sjms/support/MyInOutTestConsumer.java          |  22 ++---
 .../component/sjms2/jms/Jms2ObjectFactory.java     |  14 +--
 .../sjms2/producer/InOnlyQueueProducerTest.java    |   6 +-
 .../sjms2/producer/InOnlyTopicProducerTest.java    |   6 +-
 .../component/sjms2/support/Jms2TestSupport.java   |   8 +-
 .../dataformat/soap/Soap11DataFormatAdapter.java   |  12 +--
 .../dataformat/soap/Soap12DataFormatAdapter.java   |  14 +--
 .../camel/dataformat/soap/SoapDataFormat.java      |  12 +--
 .../camel/dataformat/soap/name/MethodInfo.java     |   2 +-
 .../soap/name/ServiceInterfaceStrategy.java        |  14 +--
 .../dataformat/soap/name/TypeNameStrategy.java     |   6 +-
 ...mlRootElementPreferringElementNameStrategy.java |   6 +-
 .../soap/name/AnnotatedClassWithNamespace.java     |   2 +-
 .../soap/name/AnnotatedClassWithoutNamespace.java  |   2 +-
 ...otElementPreferringElementNameStrategyTest.java |   4 +-
 .../name/testpackage/RequestWithDefaultNs.java     |   4 +-
 .../soap/name/testpackage/package-info.java        |   2 +-
 .../soap/MultiPartCustomerServiceImpl.java         |   2 +-
 .../camel/dataformat/soap/SoapCxfClientTest.java   |   2 +-
 .../dataformat/soap/SoapToSoapDontIgnoreTest.java  |   4 +-
 .../dataformat/soap/SoapToSoapIgnoreTest.java      |   4 +-
 .../soap/SoapToSoapSingleDataFormatterTest.java    |   4 +-
 .../camel/dataformat/soap/SoapUnMarshalTest.java   |   2 +-
 .../dataformat/soap12/Soap12UnMarshalTest.java     |   2 +-
 .../apache/camel/component/solr/SolrProducer.java  |   2 +-
 .../RedisStringIdempotentRepositoryManualIT.java   |   2 +-
 .../spring/ws/SpringWebserviceConsumer.java        |   6 +-
 .../spring/ws/filter/impl/BasicMessageFilter.java  |   2 +-
 .../net/javacrumbs/calc/model/ObjectFactory.java   |   2 +-
 .../net/javacrumbs/calc/model/PlusRequest.java     |   8 +-
 .../net/javacrumbs/calc/model/PlusResponse.java    |   8 +-
 .../net/javacrumbs/calc/model/package-info.java    |   4 +-
 .../spring/ws/SoapAttachmentResponseProcessor.java |   2 +-
 .../spring/ws/SoapResponseAttachmentTest.java      |   2 +-
 .../ws/filter/impl/BasicMessageFilterTest.java     |   2 +-
 .../component/spring/ws/jaxb/QuoteRequest.java     |   8 +-
 .../component/spring/ws/jaxb/QuoteResponse.java    |   8 +-
 .../component/spring/ws/jaxb/package-info.java     |   4 +-
 .../camel/spring/xml/CamelBeanPostProcessor.java   |   8 +-
 .../xml/CamelConsumerTemplateFactoryBean.java      |   8 +-
 .../camel/spring/xml/CamelContextFactoryBean.java  |  14 +--
 .../camel/spring/xml/CamelEndpointFactoryBean.java |   8 +-
 .../CamelFluentProducerTemplateFactoryBean.java    |   8 +-
 .../xml/CamelProducerTemplateFactoryBean.java      |   8 +-
 .../xml/CamelRedeliveryPolicyFactoryBean.java      |   8 +-
 .../spring/xml/CamelRestContextFactoryBean.java    |   8 +-
 .../CamelRouteConfigurationContextFactoryBean.java |   8 +-
 .../spring/xml/CamelRouteContextFactoryBean.java   |   8 +-
 .../xml/CamelRouteTemplateContextFactoryBean.java  |   8 +-
 .../spring/xml/CamelThreadPoolFactoryBean.java     |   8 +-
 .../xml/KeyManagersParametersFactoryBean.java      |   2 +-
 .../spring/xml/KeyStoreParametersFactoryBean.java  |   4 +-
 .../xml/SSLContextClientParametersFactoryBean.java |   4 +-
 .../xml/SSLContextParametersFactoryBean.java       |   6 +-
 .../xml/SSLContextServerParametersFactoryBean.java |   4 +-
 .../xml/SecureRandomParametersFactoryBean.java     |   4 +-
 .../spring/xml/SpringErrorHandlerDefinition.java   |  10 +-
 .../camel/spring/xml/SpringErrorHandlerType.java   |   4 +-
 .../xml/TrustManagersParametersFactoryBean.java    |   2 +-
 .../spring/xml/handler/CamelNamespaceHandler.java  |   6 +-
 .../org/apache/camel/spring/xml/package-info.java  |   4 +-
 .../config/EndpointUriSetFromSpringTest.java       |   2 +-
 ...erTemplateAutoRegisterTwoCamelContextsTest.java |   2 +-
 ...plateMixedAutoRegisterTwoCamelContextsTest.java |   2 +-
 .../CamelContextModelErrorHandlerIssueTest.java    |   6 +-
 .../spring/issues/contextscan3/MyHelloRoute.java   |   2 +-
 .../spring/KeyStoreParametersFactoryBeanTest.java  |   2 +-
 .../SSLContextParametersFactoryBeanTest.java       |   2 +-
 .../SecureRandomParametersFactoryBeanTest.java     |   2 +-
 .../java/org/apache/camel/spring/package-info.java |   4 +-
 .../component/stax/StAXJAXBIteratorExpression.java |   6 +-
 .../org/apache/camel/component/stax/StAXUtil.java  |   4 +-
 .../apache/camel/component/stax/model/Order.java   |   8 +-
 .../apache/camel/component/stax/model/Orders.java  |   8 +-
 .../apache/camel/component/stax/model/Product.java |   6 +-
 .../apache/camel/component/stax/model/Record.java  |   8 +-
 .../apache/camel/component/stax/model/Records.java |   8 +-
 .../camel/component/stax/model/RecordsUtil.java    |   6 +-
 .../camel/component/syslog/SyslogConverter.java    |   2 +-
 .../apache/camel/test/cdi/AnnotatedDecorator.java  |   2 +-
 .../camel/test/cdi/AnnotatedMethodDecorator.java   |   6 +-
 .../camel/test/cdi/AnnotatedTypeDecorator.java     |   8 +-
 .../java/org/apache/camel/test/cdi/AnyLiteral.java |   4 +-
 .../main/java/org/apache/camel/test/cdi/Beans.java |   2 +-
 .../apache/camel/test/cdi/CamelCdiDeployment.java  |   2 +-
 .../apache/camel/test/cdi/CamelCdiExtension.java   |   4 +-
 .../camel/test/cdi/CamelCdiTestExtension.java      |  30 +++---
 .../test/cdi/FrameworkAnnotatedParameter.java      |   6 +-
 .../test/cdi/FrameworkMethodInjectionPoint.java    |   8 +-
 .../org/apache/camel/test/cdi/PriorityLiteral.java |   4 +-
 .../test/cdi/CamelCdiAutoDetectRoutesTest.java     |   2 +-
 .../camel/test/cdi/CamelCdiCamelContextTest.java   |   2 +-
 .../camel/test/cdi/CamelCdiCustomContextTest.java  |  10 +-
 .../camel/test/cdi/CamelCdiNotifyBuilderTest.java  |   2 +-
 .../apache/camel/test/cdi/CamelCdiOrderTest.java   |   2 +-
 .../camel/test/cdi/CamelCdiParameterizedTest.java  |   2 +-
 .../camel/test/cdi/CamelCdiRepeatedTest.java       |   2 +-
 .../test/cdi/alternatives/AlternativeBean.java     |   4 +-
 .../camel/test/cdi/alternatives/Application.java   |   2 +-
 .../apache/camel/test/cdi/alternatives/Bean.java   |   2 +-
 .../apache/camel/test/cdi/AnnotatedDecorator.java  |   2 +-
 .../camel/test/cdi/AnnotatedMethodDecorator.java   |   6 +-
 .../camel/test/cdi/AnnotatedTypeDecorator.java     |   8 +-
 .../java/org/apache/camel/test/cdi/AnyLiteral.java |   4 +-
 .../main/java/org/apache/camel/test/cdi/Beans.java |   2 +-
 .../org/apache/camel/test/cdi/CamelCdiContext.java |   2 +-
 .../org/apache/camel/test/cdi/CamelCdiRunner.java  |   4 +-
 .../camel/test/cdi/CamelCdiTestExtension.java      |  18 ++--
 .../test/cdi/FrameworkAnnotatedParameter.java      |   6 +-
 .../test/cdi/FrameworkMethodCdiInjection.java      |   2 +-
 .../test/cdi/FrameworkMethodInjectionPoint.java    |   8 +-
 .../org/apache/camel/test/cdi/PriorityLiteral.java |   4 +-
 .../security/SpringSecurityConfiguration.java      |   2 +-
 .../spring/security/SpringSecurityProvider.java    |   8 +-
 .../AbstractSpringSecurityBearerTokenTest.java     |   2 +-
 .../component/spring/security/MockFilter.java      |  12 +--
 .../component/undertow/DefaultUndertowHost.java    |   2 +-
 .../undertow/DefaultUndertowHttpBinding.java       |   2 +-
 .../component/undertow/MultiPartFormTest.java      |   2 +-
 .../undertow/UndertowHandlersSpringTest.java       |   2 +-
 .../undertow/UndertowHttpsSpringTest.java          |   2 +-
 .../component/undertow/rest/UserJaxbPojo.java      |   8 +-
 .../websocket/jsr356/CamelServerEndpoint.java      |   8 +-
 .../camel/websocket/jsr356/ClientSessions.java     |  16 ++--
 .../DefaultServerEndpointDeploymentStrategy.java   |   6 +-
 .../camel/websocket/jsr356/JSR356Constants.java    |   2 +-
 .../camel/websocket/jsr356/JSR356Consumer.java     |   6 +-
 .../camel/websocket/jsr356/JSR356Producer.java     |   6 +-
 .../websocket/jsr356/JSR356WebSocketComponent.java |   2 +-
 .../jsr356/ServerEndpointDeploymentStrategy.java   |   6 +-
 .../camel/websocket/jsr356/ServletIntegration.java |  10 +-
 .../camel/websocket/jsr356/GreetingEncoder.java    |   4 +-
 .../camel/websocket/jsr356/JSR356ConsumerTest.java |  20 ++--
 .../camel/websocket/jsr356/JSR356ProducerTest.java |   6 +-
 .../ServerEndpointDeploymentStrategyTest.java      |  14 +--
 .../component/websocket/WebsocketComponent.java    |   2 +-
 .../impl/AbstractWordpressServiceAdapter.java      |   2 +-
 .../wordpress/api/service/spi/CategoriesSPI.java   |  18 ++--
 .../wordpress/api/service/spi/CommentsSPI.java     |  18 ++--
 .../wordpress/api/service/spi/PagesSPI.java        |  18 ++--
 .../api/service/spi/PostRevisionsSPI.java          |  14 +--
 .../wordpress/api/service/spi/PostsSPI.java        |  18 ++--
 .../wordpress/api/service/spi/TagsSPI.java         |  16 ++--
 .../wordpress/api/service/spi/TaxonomySPI.java     |  12 +--
 .../wordpress/api/service/spi/UsersSPI.java        |  16 ++--
 .../WordpressServicePostRevisionAdapterIT.java     |   2 +-
 .../src/main/java/org/apache/camel/BeanScope.java  |   2 +-
 .../java/org/apache/camel/ExchangePattern.java     |   4 +-
 .../main/java/org/apache/camel/LoggingLevel.java   |   2 +-
 .../org/apache/camel/ManagementMBeansLevel.java    |   2 +-
 .../apache/camel/ManagementStatisticsLevel.java    |   2 +-
 .../main/java/org/apache/camel/ShutdownRoute.java  |   4 +-
 .../java/org/apache/camel/ShutdownRunningTask.java |   4 +-
 .../java/org/apache/camel/StartupSummaryLevel.java |   2 +-
 .../java/org/apache/camel/TypeConverterExists.java |   2 +-
 .../org/apache/camel/WaitForTaskToComplete.java    |   4 +-
 .../main/java/org/apache/camel/package-info.java   |   4 +-
 .../apache/camel/spi/ModelJAXBContextFactory.java  |   6 +-
 .../apache/camel/model/AdviceWithDefinition.java   |   2 +-
 .../apache/camel/model/AggregateDefinition.java    |  14 +--
 .../org/apache/camel/model/BeanDefinition.java     |  10 +-
 .../apache/camel/model/BeanFactoryDefinition.java  |  10 +-
 .../org/apache/camel/model/CatchDefinition.java    |  12 +--
 .../org/apache/camel/model/ChoiceDefinition.java   |  12 +--
 .../camel/model/CircuitBreakerDefinition.java      |  14 +--
 .../apache/camel/model/ClaimCheckDefinition.java   |  10 +-
 .../apache/camel/model/ClaimCheckOperation.java    |   4 +-
 .../apache/camel/model/ContextScanDefinition.java  |  10 +-
 .../apache/camel/model/ConvertBodyDefinition.java  |  10 +-
 .../apache/camel/model/DataFormatDefinition.java   |   8 +-
 .../camel/model/DefaultRouteTemplateContext.java   |   2 +-
 .../org/apache/camel/model/DelayDefinition.java    |  10 +-
 .../apache/camel/model/DescriptionDefinition.java  |  10 +-
 .../camel/model/DynamicRouterDefinition.java       |   8 +-
 .../org/apache/camel/model/EnrichDefinition.java   |  10 +-
 .../apache/camel/model/ErrorHandlerDefinition.java |  10 +-
 .../org/apache/camel/model/ExpressionNode.java     |   8 +-
 .../model/ExpressionSubElementDefinition.java      |   8 +-
 .../model/FaultToleranceConfigurationCommon.java   |   6 +-
 .../FaultToleranceConfigurationDefinition.java     |   8 +-
 .../org/apache/camel/model/FilterDefinition.java   |   8 +-
 .../org/apache/camel/model/FinallyDefinition.java  |   8 +-
 .../org/apache/camel/model/FromDefinition.java     |  10 +-
 .../apache/camel/model/GlobalOptionDefinition.java |   8 +-
 .../camel/model/GlobalOptionsDefinition.java       |   8 +-
 .../camel/model/IdempotentConsumerDefinition.java  |  10 +-
 .../org/apache/camel/model/IdentifiedType.java     |  10 +-
 .../org/apache/camel/model/InOnlyDefinition.java   |   6 +-
 .../org/apache/camel/model/InOutDefinition.java    |   6 +-
 .../apache/camel/model/InputTypeDefinition.java    |   8 +-
 .../apache/camel/model/InterceptDefinition.java    |  10 +-
 .../camel/model/InterceptFromDefinition.java       |   8 +-
 .../model/InterceptSendToEndpointDefinition.java   |  10 +-
 .../org/apache/camel/model/KameletDefinition.java  |  10 +-
 .../apache/camel/model/LoadBalanceDefinition.java  |  12 +--
 .../apache/camel/model/LoadBalancerDefinition.java |   2 +-
 .../java/org/apache/camel/model/LogDefinition.java |  10 +-
 .../org/apache/camel/model/LoopDefinition.java     |   8 +-
 .../org/apache/camel/model/MarshalDefinition.java  |  10 +-
 .../apache/camel/model/MulticastDefinition.java    |  12 +--
 .../apache/camel/model/OnCompletionDefinition.java |  16 ++--
 .../org/apache/camel/model/OnCompletionMode.java   |   4 +-
 .../apache/camel/model/OnExceptionDefinition.java  |  14 +--
 .../apache/camel/model/OnFallbackDefinition.java   |  10 +-
 .../model/OptimisticLockRetryPolicyDefinition.java |   8 +-
 .../camel/model/OptionalIdentifiedDefinition.java  |  12 +--
 .../apache/camel/model/OtherwiseDefinition.java    |   8 +-
 .../org/apache/camel/model/OutputDefinition.java   |   6 +-
 .../apache/camel/model/OutputExpressionNode.java   |   8 +-
 .../java/org/apache/camel/model/OutputNode.java    |   2 +-
 .../apache/camel/model/OutputTypeDefinition.java   |   8 +-
 .../apache/camel/model/PackageScanDefinition.java  |   8 +-
 .../org/apache/camel/model/PausableDefinition.java |  10 +-
 .../org/apache/camel/model/PipelineDefinition.java |   8 +-
 .../org/apache/camel/model/PolicyDefinition.java   |  12 +--
 .../apache/camel/model/PollEnrichDefinition.java   |  10 +-
 .../org/apache/camel/model/ProcessDefinition.java  |  10 +-
 .../apache/camel/model/ProcessorDefinition.java    |   8 +-
 .../org/apache/camel/model/PropertyDefinition.java |   8 +-
 .../apache/camel/model/PropertyDefinitions.java    |   6 +-
 .../camel/model/PropertyExpressionDefinition.java  |  10 +-
 .../camel/model/RecipientListDefinition.java       |  10 +-
 .../camel/model/RedeliveryPolicyDefinition.java    |   8 +-
 .../apache/camel/model/RemoveHeaderDefinition.java |   8 +-
 .../camel/model/RemoveHeadersDefinition.java       |  10 +-
 .../camel/model/RemovePropertiesDefinition.java    |  10 +-
 .../camel/model/RemovePropertyDefinition.java      |   8 +-
 .../apache/camel/model/ResequenceDefinition.java   |  14 +--
 .../model/Resilience4jConfigurationCommon.java     |   6 +-
 .../model/Resilience4jConfigurationDefinition.java |   8 +-
 .../camel/model/RestContextRefDefinition.java      |   8 +-
 .../apache/camel/model/ResumableDefinition.java    |  10 +-
 .../org/apache/camel/model/RollbackDefinition.java |   8 +-
 .../apache/camel/model/RouteBuilderDefinition.java |   8 +-
 .../camel/model/RouteConfigurationContainer.java   |   2 +-
 .../RouteConfigurationContextRefDefinition.java    |   8 +-
 .../camel/model/RouteConfigurationDefinition.java  |  10 +-
 .../camel/model/RouteConfigurationsDefinition.java |  10 +-
 .../org/apache/camel/model/RouteContainer.java     |   2 +-
 .../camel/model/RouteContextRefDefinition.java     |   8 +-
 .../org/apache/camel/model/RouteDefinition.java    |  16 ++--
 .../java/org/apache/camel/model/RouteFilters.java  |   2 +-
 .../camel/model/RouteTemplateBeanDefinition.java   |   6 +-
 .../apache/camel/model/RouteTemplateContainer.java |   2 +-
 .../model/RouteTemplateContextRefDefinition.java   |   8 +-
 .../camel/model/RouteTemplateDefinition.java       |  12 +--
 .../model/RouteTemplateParameterDefinition.java    |   8 +-
 .../camel/model/RouteTemplatesDefinition.java      |  10 +-
 .../org/apache/camel/model/RoutesDefinition.java   |  10 +-
 .../apache/camel/model/RoutingSlipDefinition.java  |   8 +-
 .../camel/model/SagaActionUriDefinition.java       |   4 +-
 .../org/apache/camel/model/SagaCompletionMode.java |   4 +-
 .../org/apache/camel/model/SagaDefinition.java     |  14 +--
 .../org/apache/camel/model/SagaPropagation.java    |   4 +-
 .../org/apache/camel/model/SamplingDefinition.java |   8 +-
 .../org/apache/camel/model/ScriptDefinition.java   |   6 +-
 .../org/apache/camel/model/SendDefinition.java     |   8 +-
 .../org/apache/camel/model/SetBodyDefinition.java  |   6 +-
 .../camel/model/SetExchangePatternDefinition.java  |   8 +-
 .../apache/camel/model/SetHeaderDefinition.java    |   8 +-
 .../apache/camel/model/SetPropertyDefinition.java  |   8 +-
 .../org/apache/camel/model/SortDefinition.java     |  10 +-
 .../org/apache/camel/model/SplitDefinition.java    |  10 +-
 .../org/apache/camel/model/StepDefinition.java     |   8 +-
 .../org/apache/camel/model/StopDefinition.java     |   6 +-
 .../camel/model/TemplatedRouteBeanDefinition.java  |   6 +-
 .../camel/model/TemplatedRouteContainer.java       |   2 +-
 .../camel/model/TemplatedRouteDefinition.java      |  14 +--
 .../model/TemplatedRouteParameterDefinition.java   |   8 +-
 .../camel/model/TemplatedRoutesDefinition.java     |  10 +-
 .../camel/model/ThreadPoolProfileDefinition.java   |   8 +-
 .../org/apache/camel/model/ThreadsDefinition.java  |  10 +-
 .../org/apache/camel/model/ThrottleDefinition.java |  14 +--
 .../camel/model/ThrowExceptionDefinition.java      |  10 +-
 .../java/org/apache/camel/model/ToDefinition.java  |   8 +-
 .../apache/camel/model/ToDynamicDefinition.java    |  10 +-
 .../apache/camel/model/TransactedDefinition.java   |  12 +--
 .../apache/camel/model/TransformDefinition.java    |   6 +-
 .../java/org/apache/camel/model/TryDefinition.java |  10 +-
 .../apache/camel/model/UnmarshalDefinition.java    |  12 +--
 .../org/apache/camel/model/ValidateDefinition.java |  10 +-
 .../org/apache/camel/model/WhenDefinition.java     |   2 +-
 .../model/WhenSkipSendToEndpointDefinition.java    |   4 +-
 .../org/apache/camel/model/WireTapDefinition.java  |  10 +-
 ...klistServiceCallServiceFilterConfiguration.java |   8 +-
 ...ngServiceCallServiceDiscoveryConfiguration.java |  12 +--
 ...edServiceCallServiceDiscoveryConfiguration.java |  10 +-
 ...binedServiceCallServiceFilterConfiguration.java |  10 +-
 ...ulServiceCallServiceDiscoveryConfiguration.java |  10 +-
 ...ustomServiceCallServiceFilterConfiguration.java |  10 +-
 ...erviceCallServiceLoadBalancerConfiguration.java |   6 +-
 ...nsServiceCallServiceDiscoveryConfiguration.java |   8 +-
 ...althyServiceCallServiceFilterConfiguration.java |   6 +-
 ...esServiceCallServiceDiscoveryConfiguration.java |   8 +-
 ...roughServiceCallServiceFilterConfiguration.java |   6 +-
 .../model/cloud/ServiceCallConfiguration.java      |   8 +-
 .../cloud/ServiceCallConfigurationDefinition.java  |  14 +--
 .../camel/model/cloud/ServiceCallDefinition.java   |  14 +--
 .../cloud/ServiceCallExpressionConfiguration.java  |  12 +--
 .../ServiceCallServiceChooserConfiguration.java    |   8 +-
 .../ServiceCallServiceDiscoveryConfiguration.java  |   8 +-
 .../ServiceCallServiceFilterConfiguration.java     |   8 +-
 ...erviceCallServiceLoadBalancerConfiguration.java |   8 +-
 ...icServiceCallServiceDiscoveryConfiguration.java |   8 +-
 ...erServiceCallServiceDiscoveryConfiguration.java |   8 +-
 .../org/apache/camel/model/cloud/package-info.java |   4 +-
 .../camel/model/config/BatchResequencerConfig.java |   8 +-
 .../camel/model/config/ResequencerConfig.java      |   6 +-
 .../model/config/StreamResequencerConfig.java      |  10 +-
 .../apache/camel/model/config/package-info.java    |   4 +-
 .../camel/model/dataformat/ASN1DataFormat.java     |  10 +-
 .../camel/model/dataformat/Any23DataFormat.java    |  12 +--
 .../apache/camel/model/dataformat/Any23Type.java   |   4 +-
 .../camel/model/dataformat/AvroDataFormat.java     |  10 +-
 .../apache/camel/model/dataformat/AvroLibrary.java |   4 +-
 .../camel/model/dataformat/BarcodeDataFormat.java  |  10 +-
 .../camel/model/dataformat/Base64DataFormat.java   |  10 +-
 .../camel/model/dataformat/BindyDataFormat.java    |  10 +-
 .../apache/camel/model/dataformat/BindyType.java   |   4 +-
 .../camel/model/dataformat/CBORDataFormat.java     |  10 +-
 .../camel/model/dataformat/CryptoDataFormat.java   |  10 +-
 .../camel/model/dataformat/CsvDataFormat.java      |  12 +--
 .../camel/model/dataformat/CustomDataFormat.java   |  10 +-
 .../model/dataformat/DataFormatsDefinition.java    |  10 +-
 .../camel/model/dataformat/FhirDataformat.java     |   4 +-
 .../camel/model/dataformat/FhirJsonDataFormat.java |   8 +-
 .../camel/model/dataformat/FhirXmlDataFormat.java  |   8 +-
 .../camel/model/dataformat/FlatpackDataFormat.java |  10 +-
 .../camel/model/dataformat/GrokDataFormat.java     |  10 +-
 .../model/dataformat/GzipDeflaterDataFormat.java   |   4 +-
 .../camel/model/dataformat/HL7DataFormat.java      |  10 +-
 .../camel/model/dataformat/IcalDataFormat.java     |  10 +-
 .../model/dataformat/JacksonXMLDataFormat.java     |  10 +-
 .../camel/model/dataformat/JaxbDataFormat.java     |  10 +-
 .../camel/model/dataformat/JsonApiDataFormat.java  |  10 +-
 .../camel/model/dataformat/JsonDataFormat.java     |  10 +-
 .../apache/camel/model/dataformat/JsonLibrary.java |   4 +-
 .../camel/model/dataformat/LZFDataFormat.java      |  10 +-
 .../model/dataformat/MimeMultipartDataFormat.java  |  10 +-
 .../camel/model/dataformat/PGPDataFormat.java      |  10 +-
 .../camel/model/dataformat/ProtobufDataFormat.java |  10 +-
 .../camel/model/dataformat/ProtobufLibrary.java    |   4 +-
 .../camel/model/dataformat/RssDataFormat.java      |   8 +-
 .../camel/model/dataformat/SoapDataFormat.java     |  10 +-
 .../camel/model/dataformat/SwiftMtDataFormat.java  |  10 +-
 .../camel/model/dataformat/SwiftMxDataFormat.java  |  10 +-
 .../camel/model/dataformat/SyslogDataFormat.java   |   8 +-
 .../camel/model/dataformat/TarFileDataFormat.java  |  10 +-
 .../camel/model/dataformat/ThriftDataFormat.java   |  10 +-
 .../model/dataformat/TidyMarkupDataFormat.java     |  10 +-
 .../dataformat/UniVocityAbstractDataFormat.java    |  10 +-
 .../model/dataformat/UniVocityCsvDataFormat.java   |  10 +-
 .../model/dataformat/UniVocityFixedDataFormat.java |  10 +-
 .../camel/model/dataformat/UniVocityHeader.java    |  10 +-
 .../model/dataformat/UniVocityTsvDataFormat.java   |  10 +-
 .../model/dataformat/XMLSecurityDataFormat.java    |  10 +-
 .../camel/model/dataformat/XStreamDataFormat.java  |  12 +--
 .../camel/model/dataformat/YAMLDataFormat.java     |  12 +--
 .../apache/camel/model/dataformat/YAMLLibrary.java |   4 +-
 .../model/dataformat/YAMLTypeFilterDefinition.java |   8 +-
 .../camel/model/dataformat/YAMLTypeFilterType.java |   2 +-
 .../model/dataformat/ZipDeflaterDataFormat.java    |  10 +-
 .../camel/model/dataformat/ZipFileDataFormat.java  |  10 +-
 .../camel/model/dataformat/package-info.java       |   4 +-
 .../DeadLetterChannelConfiguration.java            |   2 +-
 .../errorhandler/DeadLetterChannelDefinition.java  |   8 +-
 .../DefaultErrorHandlerConfiguration.java          |   2 +-
 .../DefaultErrorHandlerDefinition.java             |  12 +--
 .../errorhandler/ErrorHandlerRefConfiguration.java |   2 +-
 .../errorhandler/ErrorHandlerRefDefinition.java    |   8 +-
 .../JtaTransactionErrorHandlerDefinition.java      |   6 +-
 .../errorhandler/NoErrorHandlerConfiguration.java  |   2 +-
 .../errorhandler/NoErrorHandlerDefinition.java     |   6 +-
 .../SpringTransactionErrorHandlerDefinition.java   |   6 +-
 .../TransactionErrorHandlerDefinition.java         |   4 +-
 .../camel/model/errorhandler/package-info.java     |   4 +-
 .../camel/model/language/CSimpleExpression.java    |   8 +-
 .../camel/model/language/ConstantExpression.java   |   8 +-
 .../camel/model/language/DatasonnetExpression.java |  10 +-
 .../model/language/ExchangePropertyExpression.java |   8 +-
 .../camel/model/language/ExpressionDefinition.java |  16 ++--
 .../camel/model/language/GroovyExpression.java     |   8 +-
 .../camel/model/language/HeaderExpression.java     |   8 +-
 .../camel/model/language/Hl7TerserExpression.java  |   8 +-
 .../camel/model/language/JavaScriptExpression.java |   8 +-
 .../camel/model/language/JoorExpression.java       |  10 +-
 .../apache/camel/model/language/JqExpression.java  |   8 +-
 .../camel/model/language/JsonPathExpression.java   |  10 +-
 .../camel/model/language/LanguageExpression.java   |  10 +-
 .../camel/model/language/MethodCallExpression.java |  10 +-
 .../camel/model/language/MvelExpression.java       |   8 +-
 .../model/language/NamespaceAwareExpression.java   |   8 +-
 .../camel/model/language/OgnlExpression.java       |   8 +-
 .../camel/model/language/PythonExpression.java     |   8 +-
 .../apache/camel/model/language/RefExpression.java |   8 +-
 .../camel/model/language/SimpleExpression.java     |   8 +-
 .../language/SingleInputExpressionDefinition.java  |   4 +-
 .../SingleInputTypedExpressionDefinition.java      |   4 +-
 .../camel/model/language/SpELExpression.java       |   8 +-
 .../camel/model/language/TokenizerExpression.java  |  10 +-
 .../model/language/TypedExpressionDefinition.java  |   4 +-
 .../model/language/XMLTokenizerExpression.java     |  10 +-
 .../camel/model/language/XPathExpression.java      |  10 +-
 .../camel/model/language/XQueryExpression.java     |  10 +-
 .../apache/camel/model/language/package-info.java  |   4 +-
 .../loadbalancer/CustomLoadBalancerDefinition.java |  10 +-
 .../FailoverLoadBalancerDefinition.java            |  12 +--
 .../loadbalancer/RandomLoadBalancerDefinition.java |   6 +-
 .../RoundRobinLoadBalancerDefinition.java          |   6 +-
 .../loadbalancer/StickyLoadBalancerDefinition.java |   8 +-
 .../loadbalancer/TopicLoadBalancerDefinition.java  |   6 +-
 .../WeightedLoadBalancerDefinition.java            |   8 +-
 .../camel/model/loadbalancer/package-info.java     |   4 +-
 .../java/org/apache/camel/model/package-info.java  |   4 +-
 .../apache/camel/model/rest/ApiKeyDefinition.java  |   8 +-
 .../camel/model/rest/BasicAuthDefinition.java      |   6 +-
 .../camel/model/rest/BearerTokenDefinition.java    |   8 +-
 .../apache/camel/model/rest/CollectionFormat.java  |   4 +-
 .../apache/camel/model/rest/DeleteDefinition.java  |   6 +-
 .../org/apache/camel/model/rest/GetDefinition.java |   6 +-
 .../apache/camel/model/rest/HeadDefinition.java    |   6 +-
 .../camel/model/rest/MutualTLSDefinition.java      |   6 +-
 .../apache/camel/model/rest/OAuth2Definition.java  |  10 +-
 .../camel/model/rest/OpenIdConnectDefinition.java  |   8 +-
 .../apache/camel/model/rest/ParamDefinition.java   |  14 +--
 .../apache/camel/model/rest/PatchDefinition.java   |   6 +-
 .../apache/camel/model/rest/PostDefinition.java    |   6 +-
 .../org/apache/camel/model/rest/PutDefinition.java |   6 +-
 .../camel/model/rest/ResponseHeaderDefinition.java |  14 +--
 .../model/rest/ResponseMessageDefinition.java      |  12 +--
 .../camel/model/rest/RestBindingDefinition.java    |  10 +-
 .../apache/camel/model/rest/RestBindingMode.java   |   4 +-
 .../model/rest/RestConfigurationDefinition.java    |  10 +-
 .../org/apache/camel/model/rest/RestContainer.java |   2 +-
 .../apache/camel/model/rest/RestDefinition.java    |  12 +--
 .../camel/model/rest/RestHostNameResolver.java     |   4 +-
 .../org/apache/camel/model/rest/RestParamType.java |   4 +-
 .../camel/model/rest/RestPropertyDefinition.java   |   8 +-
 .../camel/model/rest/RestSecuritiesDefinition.java |  12 +--
 .../camel/model/rest/RestSecurityDefinition.java   |   8 +-
 .../apache/camel/model/rest/RestsDefinition.java   |   8 +-
 .../camel/model/rest/SecurityDefinition.java       |   8 +-
 .../apache/camel/model/rest/VerbDefinition.java    |  12 +--
 .../org/apache/camel/model/rest/package-info.java  |   4 +-
 .../transformer/CustomTransformerDefinition.java   |   8 +-
 .../DataFormatTransformerDefinition.java           |  10 +-
 .../transformer/EndpointTransformerDefinition.java |   8 +-
 .../model/transformer/TransformerDefinition.java   |   8 +-
 .../model/transformer/TransformersDefinition.java  |  10 +-
 .../camel/model/transformer/package-info.java      |   4 +-
 .../model/validator/CustomValidatorDefinition.java |   8 +-
 .../validator/EndpointValidatorDefinition.java     |   8 +-
 .../validator/PredicateValidatorDefinition.java    |   8 +-
 .../camel/model/validator/ValidatorDefinition.java |   8 +-
 .../model/validator/ValidatorsDefinition.java      |  10 +-
 .../apache/camel/model/validator/package-info.java |   4 +-
 .../AbstractCamelConsumerTemplateFactoryBean.java  |   8 +-
 .../core/xml/AbstractCamelContextFactoryBean.java  |   6 +-
 .../core/xml/AbstractCamelEndpointFactoryBean.java |  10 +-
 .../camel/core/xml/AbstractCamelFactoryBean.java   |   8 +-
 ...ractCamelFluentProducerTemplateFactoryBean.java |   8 +-
 .../AbstractCamelProducerTemplateFactoryBean.java  |   8 +-
 .../AbstractCamelRedeliveryPolicyFactoryBean.java  |   6 +-
 .../xml/AbstractCamelThreadPoolFactoryBean.java    |   6 +-
 .../camel/core/xml/CamelJMXAgentDefinition.java    |   8 +-
 .../xml/CamelPropertyPlaceholderDefinition.java    |  10 +-
 ...CamelPropertyPlaceholderFunctionDefinition.java |   4 +-
 ...CamelPropertyPlaceholderLocationDefinition.java |   4 +-
 .../core/xml/CamelRouteControllerDefinition.java   |   8 +-
 .../xml/CamelStreamCachingStrategyDefinition.java  |   8 +-
 .../org/apache/camel/core/xml/package-info.java    |   4 +-
 ...bstractBaseSSLContextParametersFactoryBean.java |   4 +-
 .../AbstractKeyManagersParametersFactoryBean.java  |   8 +-
 .../AbstractKeyStoreParametersFactoryBean.java     |   8 +-
 ...tractSSLContextClientParametersFactoryBean.java |   8 +-
 .../AbstractSSLContextParametersFactoryBean.java   |   8 +-
 ...tractSSLContextServerParametersFactoryBean.java |   8 +-
 .../AbstractSecureRandomParametersFactoryBean.java |   8 +-
 ...AbstractTrustManagersParametersFactoryBean.java |   8 +-
 .../jsse/CipherSuitesParametersDefinition.java     |   6 +-
 .../xml/util/jsse/FilterParametersDefinition.java  |   6 +-
 .../core/xml/util/jsse/SNIHostNamesDefinition.java |   8 +-
 .../SecureSocketProtocolsParametersDefinition.java |   6 +-
 .../camel/core/xml/util/jsse/package-info.java     |   4 +-
 .../CamelContextAddRestDefinitionsFromXmlTest.java |   6 +-
 ...CamelContextAddRouteDefinitionsFromXmlTest.java |   6 +-
 .../model/GenerateXmFromCamelContextTest.java      |   4 +-
 .../org/apache/camel/model/GenerateXmlTest.java    |   2 +-
 .../apache/camel/model/ModelSanityCheckerTest.java |   8 +-
 .../java/org/apache/camel/model/XmlParseTest.java  |   2 +-
 .../org/apache/camel/model/XmlRestParseTest.java   |   2 +-
 .../org/apache/camel/model/XmlRouteGroupTest.java  |   2 +-
 .../apache/camel/model/XmlRoutePropertiesTest.java |   2 +-
 .../org/apache/camel/model/XmlTestSupport.java     |   6 +-
 .../model/dataformat/Any23DataFormatTest.java      |   6 +-
 ...ggregationStrategyBeanAdapterAllowNullTest.java |   2 +-
 .../onexception/OnExceptionMisconfiguredTest.java  |   2 +-
 .../xml/jaxb/DefaultModelJAXBContextFactory.java   |   4 +-
 .../java/org/apache/camel/xml/jaxb/JaxbHelper.java |   8 +-
 .../camel/xml/jaxb/JaxbModelToXMLDumper.java       |   4 +-
 .../dsl/ActivemqComponentBuilderFactory.java       |  24 ++---
 .../component/dsl/AmqpComponentBuilderFactory.java |  24 ++---
 .../dsl/BeanValidatorComponentBuilderFactory.java  |  30 +++---
 .../component/dsl/ImapComponentBuilderFactory.java |  12 +--
 .../dsl/ImapsComponentBuilderFactory.java          |  12 +--
 .../component/dsl/JmsComponentBuilderFactory.java  |  24 ++---
 .../component/dsl/JpaComponentBuilderFactory.java  |   6 +-
 .../component/dsl/Pop3ComponentBuilderFactory.java |  12 +--
 .../dsl/Pop3sComponentBuilderFactory.java          |  12 +--
 .../dsl/Sjms2ComponentBuilderFactory.java          |  14 +--
 .../component/dsl/SjmsComponentBuilderFactory.java |  14 +--
 .../component/dsl/SmtpComponentBuilderFactory.java |  12 +--
 .../dsl/SmtpsComponentBuilderFactory.java          |  12 +--
 .../endpoint/dsl/AMQPEndpointBuilderFactory.java   | 106 ++++++++++-----------
 .../dsl/ActiveMQEndpointBuilderFactory.java        | 106 ++++++++++-----------
 .../AtmosphereWebsocketEndpointBuilderFactory.java |   4 +-
 .../dsl/BeanValidatorEndpointBuilderFactory.java   |  32 +++----
 .../dsl/JSR356WebSocketEndpointBuilderFactory.java |   2 +-
 .../dsl/JettyHttpEndpointBuilderFactory.java       |  16 ++--
 .../endpoint/dsl/JmsEndpointBuilderFactory.java    | 106 ++++++++++-----------
 .../endpoint/dsl/JpaEndpointBuilderFactory.java    |   8 +-
 .../endpoint/dsl/MailEndpointBuilderFactory.java   |  38 ++++----
 .../dsl/ResteasyEndpointBuilderFactory.java        |   4 +-
 .../dsl/ServletEndpointBuilderFactory.java         |   4 +-
 .../endpoint/dsl/Sjms2EndpointBuilderFactory.java  |  76 +++++++--------
 .../endpoint/dsl/SjmsEndpointBuilderFactory.java   |  76 +++++++--------
 .../apache/camel/dsl/java/joor/MultiCompile.java   |   4 +-
 .../main/download/MavenDependencyDownloader.java   |   2 +-
 .../injection/AnnotationDependencyInjection.java   |  10 +-
 .../apache/camel/main/injection/DIRegistry.java    |   8 +-
 .../camel/main/injection/DIRegistryTest.java       |   4 +-
 .../cdi/RouteDefinitionsFromXmlTest.java           |   4 +-
 .../maven/dsl/yaml/GenerateYamlSupportMojo.java    |  20 ++--
 .../activemq/common/ConnectionFactoryHelper.java   |   2 +-
 .../services/AbstractActiveMQEmbeddedService.java  |   2 +-
 .../activemq/services/ConnectionFactoryAware.java  |   2 +-
 .../infra/jetty/services/JettyConfiguration.java   |   2 +-
 .../java/org/apache/camel/itest/cdi/MyRoutes.java  |   4 +-
 .../org/apache/camel/itest/cdi/CamelCdiTest.java   |   2 +-
 .../itest/cdi/PropertiesConfigurationTest.java     |   8 +-
 .../camel/itest/jms2/BaseJms2TestSupport.java      |  12 +--
 .../org/apache/camel/itest/CamelJmsTestHelper.java |   2 +-
 .../org/apache/camel/itest/greeter/Server.java     |   2 +-
 .../org/apache/camel/itest/issues/BaseClass.java   |   4 +-
 .../itest/jaxb/SpringLoadRouteFromXmlTest.java     |   4 +-
 .../org/apache/camel/itest/jaxb/example/Bar.java   |   8 +-
 .../org/apache/camel/itest/jms/PurchaseOrder.java  |   8 +-
 .../org/apache/camel/itest/proxy/EchoClient.java   |   2 +-
 .../camel/itest/security/CXFMessageProcessor.java  |   4 +-
 .../camel/itest/security/GreeterClientTest.java    |   6 +-
 .../org/apache/camel/itest/tx/JmsToHttpRoute.java  |   2 +-
 .../itest/tx/JmsToHttpWithOnExceptionRoute.java    |   2 +-
 .../camel/itest/tx/JmsToHttpWithRollbackRoute.java |   2 +-
 .../camel/itest/utils/extensions/GreeterImpl.java  |   2 +-
 .../utils/extensions/GreeterServiceExtension.java  |   2 +-
 .../utils/extensions/JmsServiceExtension.java      |   4 +-
 .../jvnet/mock_javamail/provider/IMAPProvider.java |   2 +-
 .../jvnet/mock_javamail/provider/POP3Provider.java |   2 +-
 .../jvnet/mock_javamail/provider/SMTPProvider.java |   2 +-
 .../packaging/ModelXmlParserGeneratorMojo.java     |  28 +++---
 .../camel/maven/packaging/PackageJaxbMojo.java     |   6 +-
 .../camel/maven/packaging/SchemaGeneratorMojo.java |  14 +--
 .../SpringBootProjectSourceCodeGenerator.java      |   4 +-
 .../SpringBootProjectSourceCodeGenerator.java      |   4 +-
 1428 files changed, 4956 insertions(+), 4956 deletions(-)

diff --git a/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/src/main/java/MyRoutes.java b/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/src/main/java/MyRoutes.java
index 398a7ac2e4c..71699b30bd6 100644
--- a/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/src/main/java/MyRoutes.java
+++ b/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/src/main/java/MyRoutes.java
@@ -16,7 +16,7 @@
 ## ------------------------------------------------------------------------
 package ${package};
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/src/main/java/SomeBean.java b/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/src/main/java/SomeBean.java
index c3ca29a54b9..3cf12ea2ab6 100644
--- a/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/src/main/java/SomeBean.java
+++ b/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/src/main/java/SomeBean.java
@@ -16,8 +16,8 @@
 ## ------------------------------------------------------------------------
 package ${package};
 
-import javax.inject.Named;
-import javax.inject.Singleton;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 
 @Singleton
 @Named("counterBean")
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiConcatRouteBuilder.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiConcatRouteBuilder.java
index a703f74945d..c3134535e8c 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiConcatRouteBuilder.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiConcatRouteBuilder.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.parser.java;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.EndpointInject;
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiRouteBuilder.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiRouteBuilder.java
index 84dfe229e6f..fcb907fb024 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiRouteBuilder.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiRouteBuilder.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.parser.java;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/converter/ActiveMQMessageConverterLoader.java b/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/converter/ActiveMQMessageConverterLoader.java
index 66f5397f339..dc8352e038e 100644
--- a/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/converter/ActiveMQMessageConverterLoader.java
+++ b/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/converter/ActiveMQMessageConverterLoader.java
@@ -43,8 +43,8 @@ public final class ActiveMQMessageConverterLoader implements TypeConverterLoader
     private void registerConverters(TypeConverterRegistry registry) {
         addTypeConverter(registry, org.apache.activemq.command.ActiveMQMessage.class, org.apache.camel.Exchange.class, false,
             (type, exchange, value) -> getActiveMQMessageConverter().toMessage((org.apache.camel.Exchange) value));
-        addTypeConverter(registry, org.apache.camel.Processor.class, javax.jms.MessageListener.class, false,
-            (type, exchange, value) -> getActiveMQMessageConverter().toProcessor((javax.jms.MessageListener) value));
+        addTypeConverter(registry, org.apache.camel.Processor.class, jakarta.jms.MessageListener.class, false,
+            (type, exchange, value) -> getActiveMQMessageConverter().toProcessor((jakarta.jms.MessageListener) value));
     }
 
     private static void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) { 
diff --git a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
index e402a118a3e..09395ece300 100644
--- a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
+++ b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.activemq;
 
 import java.lang.reflect.Constructor;
 
-import javax.jms.ConnectionFactory;
+import jakarta.jms.ConnectionFactory;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.Service;
diff --git a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/OriginalDestinationPropagateStrategy.java b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/OriginalDestinationPropagateStrategy.java
index 3fbf82e1435..1c56c5d2b6c 100644
--- a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/OriginalDestinationPropagateStrategy.java
+++ b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/OriginalDestinationPropagateStrategy.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.component.activemq;
 
-import javax.jms.Message;
-import javax.jms.Session;
+import jakarta.jms.Message;
+import jakarta.jms.Session;
 
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQMessage;
diff --git a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/converter/ActiveMQMessageConverter.java b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/converter/ActiveMQMessageConverter.java
index 61426756373..c267e456240 100644
--- a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/converter/ActiveMQMessageConverter.java
+++ b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/converter/ActiveMQMessageConverter.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.activemq.converter;
 
 import java.io.Serializable;
 
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageListener;
 
 import org.apache.activemq.command.ActiveMQMessage;
 import org.apache.activemq.command.ActiveMQObjectMessage;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java
index 3be327d110f..f03f576a4dc 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.activemq;
 import java.util.Date;
 import java.util.List;
 
-import javax.jms.Destination;
+import jakarta.jms.Destination;
 
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.camel.CamelContext;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java
index 4c2e79a5743..b6248fa0446 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.activemq;
 
-import javax.jms.Message;
+import jakarta.jms.Message;
 
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQMessage;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java
index 4b3a4f37927..2e1b19b80ee 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.jms.Destination;
+import jakarta.jms.Destination;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AdvisoryConsumerExampleTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AdvisoryConsumerExampleTest.java
index c593311ef8f..ffc2b15787a 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AdvisoryConsumerExampleTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AdvisoryConsumerExampleTest.java
@@ -59,7 +59,7 @@ public class AdvisoryConsumerExampleTest extends ActiveMQTestSupport {
                         Message in = exchange.getIn();
                         if (in instanceof JmsMessage) {
                             JmsMessage jmsMessage = (JmsMessage) in;
-                            javax.jms.Message value = jmsMessage.getJmsMessage();
+                            jakarta.jms.Message value = jmsMessage.getJmsMessage();
                             if (value instanceof ActiveMQMessage) {
                                 ActiveMQMessage activeMQMessage = (ActiveMQMessage) value;
                                 DataStructure structure = activeMQMessage.getDataStructure();
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelVMTransportRoutingTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelVMTransportRoutingTest.java
index 98ef5e6e545..7ff423c0b7a 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelVMTransportRoutingTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelVMTransportRoutingTest.java
@@ -16,12 +16,12 @@
  */
 package org.apache.camel.component.activemq;
 
-import javax.jms.Connection;
-import javax.jms.Destination;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.Destination;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.util.ThreadTracker;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/DlqTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/DlqTest.java
index 0d231ae782d..3f267ed7bf9 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/DlqTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/DlqTest.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.component.activemq;
 
-import javax.jms.Connection;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.command.ActiveMQQueue;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/InvokeRequestReplyUsingJmsReplyToHeaderTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/InvokeRequestReplyUsingJmsReplyToHeaderTest.java
index e448adec48e..92c4f1836ca 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/InvokeRequestReplyUsingJmsReplyToHeaderTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/InvokeRequestReplyUsingJmsReplyToHeaderTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.activemq;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.jms.Destination;
+import jakarta.jms.Destination;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsBridge.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsBridge.java
index 091d7254146..ecd387b463d 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsBridge.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsBridge.java
@@ -19,12 +19,12 @@ package org.apache.camel.component.activemq;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.jms.Connection;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.Message;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerPlugin;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsConsumeSendTransacted.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsConsumeSendTransacted.java
index 40e75b8c30d..84f48d8da1d 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsConsumeSendTransacted.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsConsumeSendTransacted.java
@@ -18,12 +18,12 @@ package org.apache.camel.component.activemq;
 
 import java.util.Map;
 
-import javax.jms.Connection;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.Message;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.command.ActiveMQQueue;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXARollbackTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXARollbackTest.java
index e1517c006ec..e95fbbd12eb 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXARollbackTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXARollbackTest.java
@@ -20,14 +20,14 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Map;
 
-import javax.jms.Connection;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.Message;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
 import javax.sql.DataSource;
-import javax.transaction.TransactionManager;
+import jakarta.transaction.TransactionManager;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.region.policy.SharedDeadLetterStrategy;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXATest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXATest.java
index fa93ff51082..f8435554d60 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXATest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXATest.java
@@ -22,10 +22,10 @@ import java.sql.SQLException;
 import java.util.Map;
 import java.util.concurrent.Executors;
 
-import javax.jms.Connection;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
 import javax.sql.DataSource;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsSimpleRequestReplyTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsSimpleRequestReplyTest.java
index 48448996311..a7dde6011d5 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsSimpleRequestReplyTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsSimpleRequestReplyTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.activemq;
 
-import javax.jms.ConnectionFactory;
+import jakarta.jms.ConnectionFactory;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.pool.PooledConnectionFactory;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ObjectMessageTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ObjectMessageTest.java
index 6e9192ace3f..3359f969504 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ObjectMessageTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ObjectMessageTest.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.component.activemq;
 
-import javax.jms.Connection;
-import javax.jms.JMSException;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Session;
+import jakarta.jms.Connection;
+import jakarta.jms.JMSException;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.ObjectMessage;
+import jakarta.jms.Session;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.camel.Exchange;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/PoisonJMSPayloadTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/PoisonJMSPayloadTest.java
index c4e54059e9c..4b214973cee 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/PoisonJMSPayloadTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/PoisonJMSPayloadTest.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.component.activemq;
 
-import javax.jms.Connection;
-import javax.jms.JMSException;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Session;
+import jakarta.jms.Connection;
+import jakarta.jms.JMSException;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.ObjectMessage;
+import jakarta.jms.Session;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.camel.component.activemq.support.ActiveMQSpringTestSupport;
@@ -41,7 +41,7 @@ public class PoisonJMSPayloadTest extends ActiveMQSpringTestSupport {
         getMockEndpoint("mock:dead").expectedMessageCount(1);
         getMockEndpoint("mock:dead").message(0).body(String.class)
                 .startsWith(
-                        "Poison JMS message payload: Failed to extract body due to: javax.jms.JMSException: Failed to build body from content. Serializable class not available to broker.");
+                        "Poison JMS message payload: Failed to extract body due to: jakarta.jms.JMSException: Failed to build body from content. Serializable class not available to broker.");
 
         factory = new ActiveMQConnectionFactory(vmUri());
         Connection conn = factory.createConnection();
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java
index d60efb65036..acb3794eded 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java
@@ -20,10 +20,10 @@ import java.io.IOException;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
-import javax.jms.Connection;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/ConsumerBean.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/ConsumerBean.java
index 24df76e0fbf..cc1c505e993 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/ConsumerBean.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/ConsumerBean.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.activemq.converter;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.jms.Message;
-import javax.jms.MessageListener;
+import jakarta.jms.Message;
+import jakarta.jms.MessageListener;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeJmsMessageListenerTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeJmsMessageListenerTest.java
index 651958b4c34..e15432f09fa 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeJmsMessageListenerTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeJmsMessageListenerTest.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.component.activemq.converter;
 
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.TextMessage;
+import jakarta.jms.Message;
+import jakarta.jms.MessageListener;
+import jakarta.jms.TextMessage;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit5.CamelTestSupport;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java
index fadff8bfe5a..d7a9a2645a9 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.activemq.converter;
 
 import java.util.List;
 
-import javax.jms.Message;
-import javax.jms.TextMessage;
+import jakarta.jms.Message;
+import jakarta.jms.TextMessage;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
index f7b974e809d..2de4e69142a 100644
--- a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
+++ b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.amqp;
 import java.util.Map;
 import java.util.Set;
 
-import javax.jms.ConnectionFactory;
+import jakarta.jms.ConnectionFactory;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
diff --git a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConfiguration.java b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConfiguration.java
index 4603c692265..bfb8e80bb98 100644
--- a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConfiguration.java
+++ b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConfiguration.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.amqp;
 
-import javax.jms.ConnectionFactory;
+import jakarta.jms.ConnectionFactory;
 
 import org.apache.camel.component.jms.JmsConfiguration;
 import org.apache.camel.spi.UriParam;
diff --git a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPJmsBinding.java b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPJmsBinding.java
index 763670872ed..cfd3096ac09 100644
--- a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPJmsBinding.java
+++ b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPJmsBinding.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.amqp;
 
 import java.util.Map;
 
-import javax.jms.Message;
+import jakarta.jms.Message;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.component.jms.JmsBinding;
diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
index 21079ac5aa3..1f9d332bb0b 100644
--- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
+++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
@@ -18,12 +18,12 @@ package org.apache.camel.component.amqp;
 
 import java.util.function.Consumer;
 
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSException;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.JMSException;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.EndpointInject;
diff --git a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/CamelWebSocketServlet.java b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/CamelWebSocketServlet.java
index 030fffe0811..f1e8c5aab35 100644
--- a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/CamelWebSocketServlet.java
+++ b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/CamelWebSocketServlet.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.atmosphere.websocket;
 import java.io.IOException;
 import java.util.Map;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.camel.component.servlet.CamelHttpTransportServlet;
 import org.apache.camel.http.common.HttpConsumer;
diff --git a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketConsumer.java b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketConsumer.java
index db108011a59..ee0d6586fc5 100644
--- a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketConsumer.java
+++ b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketConsumer.java
@@ -21,10 +21,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.Exchange;
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/MyHttpServlet.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/MyHttpServlet.java
index 944fa4f7187..26f5eea893c 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/MyHttpServlet.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/MyHttpServlet.java
@@ -21,9 +21,9 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.FileUtils;
 
diff --git a/components/camel-attachments/src/generated/java/org/apache/camel/attachment/AttachmentConverterLoader.java b/components/camel-attachments/src/generated/java/org/apache/camel/attachment/AttachmentConverterLoader.java
index d191b572134..8d3b4f6aa6e 100644
--- a/components/camel-attachments/src/generated/java/org/apache/camel/attachment/AttachmentConverterLoader.java
+++ b/components/camel-attachments/src/generated/java/org/apache/camel/attachment/AttachmentConverterLoader.java
@@ -41,7 +41,7 @@ public final class AttachmentConverterLoader implements TypeConverterLoader, Cam
     }
 
     private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, javax.activation.DataHandler.class, org.apache.camel.attachment.Attachment.class, false,
+        addTypeConverter(registry, jakarta.activation.DataHandler.class, org.apache.camel.attachment.Attachment.class, false,
             (type, exchange, value) -> org.apache.camel.attachment.AttachmentConverter.toDataHandler((org.apache.camel.attachment.Attachment) value));
         addTypeConverter(registry, org.apache.camel.attachment.AttachmentMessage.class, org.apache.camel.Message.class, false,
             (type, exchange, value) -> org.apache.camel.attachment.AttachmentConverter.toAttachmentMessage((org.apache.camel.Message) value));
diff --git a/components/camel-attachments/src/main/java/org/apache/camel/attachment/Attachment.java b/components/camel-attachments/src/main/java/org/apache/camel/attachment/Attachment.java
index 1584092035a..7bf419dace9 100644
--- a/components/camel-attachments/src/main/java/org/apache/camel/attachment/Attachment.java
+++ b/components/camel-attachments/src/main/java/org/apache/camel/attachment/Attachment.java
@@ -19,7 +19,7 @@ package org.apache.camel.attachment;
 import java.util.Collection;
 import java.util.List;
 
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
 
 import org.apache.camel.Message;
 
diff --git a/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentConverter.java b/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentConverter.java
index 3d395a64070..d4ff827c44b 100644
--- a/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentConverter.java
+++ b/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentConverter.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.attachment;
 
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
 
 import org.apache.camel.Converter;
 import org.apache.camel.Message;
diff --git a/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentMessage.java b/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentMessage.java
index 1a13007e570..b97461a09c3 100644
--- a/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentMessage.java
+++ b/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentMessage.java
@@ -19,12 +19,12 @@ package org.apache.camel.attachment;
 import java.util.Map;
 import java.util.Set;
 
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
 
 import org.apache.camel.Message;
 
 /**
- * Extended {@link Message} for Java Attachment Support (with javax.activation).
+ * Extended {@link Message} for Java Attachment Support (with jakarta.activation).
  */
 public interface AttachmentMessage extends Message {
 
diff --git a/components/camel-attachments/src/main/java/org/apache/camel/attachment/CamelFileDataSource.java b/components/camel-attachments/src/main/java/org/apache/camel/attachment/CamelFileDataSource.java
index edde8cbc06c..1f26d9d6db7 100644
--- a/components/camel-attachments/src/main/java/org/apache/camel/attachment/CamelFileDataSource.java
+++ b/components/camel-attachments/src/main/java/org/apache/camel/attachment/CamelFileDataSource.java
@@ -18,8 +18,8 @@ package org.apache.camel.attachment;
 
 import java.io.File;
 
-import javax.activation.FileDataSource;
-import javax.activation.FileTypeMap;
+import jakarta.activation.FileDataSource;
+import jakarta.activation.FileTypeMap;
 
 public class CamelFileDataSource extends FileDataSource {
     private final String fileName;
diff --git a/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachment.java b/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachment.java
index e55d1291d06..b1490975e38 100644
--- a/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachment.java
+++ b/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachment.java
@@ -22,8 +22,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
-import javax.activation.DataHandler;
-import javax.activation.DataSource;
+import jakarta.activation.DataHandler;
+import jakarta.activation.DataSource;
 
 import org.apache.camel.util.CollectionHelper;
 
diff --git a/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachmentMessage.java b/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachmentMessage.java
index 0d3e5416257..37f6c2ba202 100644
--- a/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachmentMessage.java
+++ b/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachmentMessage.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.function.Supplier;
 
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.ExtendedExchange;
diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java
index c58cdbb9428..ac4e285902b 100644
--- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java
+++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.attachment;
 
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
+import jakarta.activation.DataHandler;
+import jakarta.activation.FileDataSource;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/BodyAndHeaderConvertTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/BodyAndHeaderConvertTest.java
index 67bb0f7b9ad..01ad2464728 100644
--- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/BodyAndHeaderConvertTest.java
+++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/BodyAndHeaderConvertTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.attachment;
 
 import java.net.URL;
 
-import javax.activation.DataHandler;
-import javax.activation.URLDataSource;
+import jakarta.activation.DataHandler;
+import jakarta.activation.URLDataSource;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java
index 2519b09bdf0..65fbd740989 100644
--- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java
+++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.attachment;
 
 import java.io.File;
 
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
+import jakarta.activation.DataHandler;
+import jakarta.activation.FileDataSource;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/WireTapTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/WireTapTest.java
index 5e8167ae14b..6d0aa8f18bd 100644
--- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/WireTapTest.java
+++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/WireTapTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.attachment;
 import java.io.File;
 import java.util.Iterator;
 
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
+import jakarta.activation.DataHandler;
+import jakarta.activation.FileDataSource;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Producer.java b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Producer.java
index 6bc9501c3ee..cb1f0376483 100644
--- a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Producer.java
+++ b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Producer.java
@@ -58,7 +58,7 @@ public class Ses2Producer extends DefaultProducer {
 
     @Override
     public void process(Exchange exchange) throws Exception {
-        if (!(exchange.getIn().getBody() instanceof javax.mail.Message)) {
+        if (!(exchange.getIn().getBody() instanceof jakarta.mail.Message)) {
             SendEmailRequest request = createMailRequest(exchange);
             LOG.trace("Sending request [{}] from exchange [{}]...", request, exchange);
             SendEmailResponse result = getEndpoint().getSESClient().sendEmail(request);
@@ -112,7 +112,7 @@ public class Ses2Producer extends DefaultProducer {
     private software.amazon.awssdk.services.ses.model.RawMessage createRawMessage(Exchange exchange) throws Exception {
         software.amazon.awssdk.services.ses.model.RawMessage.Builder message
                 = software.amazon.awssdk.services.ses.model.RawMessage.builder();
-        javax.mail.Message content = exchange.getIn().getBody(javax.mail.Message.class);
+        jakarta.mail.Message content = exchange.getIn().getBody(jakarta.mail.Message.class);
         OutputStream byteOutput = new ByteArrayOutputStream();
         try {
             content.writeTo(byteOutput);
diff --git a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/MockMessage.java b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/MockMessage.java
index e82e3e50012..147b4fb12ec 100644
--- a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/MockMessage.java
+++ b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/MockMessage.java
@@ -21,12 +21,12 @@ import java.io.OutputStream;
 import java.util.Date;
 import java.util.Enumeration;
 
-import javax.activation.DataHandler;
-import javax.mail.Address;
-import javax.mail.Flags;
-import javax.mail.Header;
-import javax.mail.Message;
-import javax.mail.Multipart;
+import jakarta.activation.DataHandler;
+import jakarta.mail.Address;
+import jakarta.mail.Flags;
+import jakarta.mail.Header;
+import jakarta.mail.Message;
+import jakarta.mail.Multipart;
 
 public class MockMessage extends Message {
 
diff --git a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorComponentConfigurer.java b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorComponentConfigurer.java
index b794d832414..007a882e54e 100644
--- a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorComponentConfigurer.java
+++ b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorComponentConfigurer.java
@@ -24,19 +24,19 @@ public class BeanValidatorComponentConfigurer extends PropertyConfigurerSupport
         case "autowiredenabled":
         case "autowiredEnabled": target.setAutowiredEnabled(property(camelContext, boolean.class, value)); return true;
         case "constraintvalidatorfactory":
-        case "constraintValidatorFactory": target.setConstraintValidatorFactory(property(camelContext, javax.validation.ConstraintValidatorFactory.class, value)); return true;
+        case "constraintValidatorFactory": target.setConstraintValidatorFactory(property(camelContext, jakarta.validation.ConstraintValidatorFactory.class, value)); return true;
         case "ignorexmlconfiguration":
         case "ignoreXmlConfiguration": target.setIgnoreXmlConfiguration(property(camelContext, boolean.class, value)); return true;
         case "lazystartproducer":
         case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
         case "messageinterpolator":
-        case "messageInterpolator": target.setMessageInterpolator(property(camelContext, javax.validation.MessageInterpolator.class, value)); return true;
+        case "messageInterpolator": target.setMessageInterpolator(property(camelContext, jakarta.validation.MessageInterpolator.class, value)); return true;
         case "traversableresolver":
-        case "traversableResolver": target.setTraversableResolver(property(camelContext, javax.validation.TraversableResolver.class, value)); return true;
+        case "traversableResolver": target.setTraversableResolver(property(camelContext, jakarta.validation.TraversableResolver.class, value)); return true;
         case "validationproviderresolver":
-        case "validationProviderResolver": target.setValidationProviderResolver(property(camelContext, javax.validation.ValidationProviderResolver.class, value)); return true;
+        case "validationProviderResolver": target.setValidationProviderResolver(property(camelContext, jakarta.validation.ValidationProviderResolver.class, value)); return true;
         case "validatorfactory":
-        case "validatorFactory": target.setValidatorFactory(property(camelContext, javax.validation.ValidatorFactory.class, value)); return true;
+        case "validatorFactory": target.setValidatorFactory(property(camelContext, jakarta.validation.ValidatorFactory.class, value)); return true;
         default: return false;
         }
     }
@@ -52,19 +52,19 @@ public class BeanValidatorComponentConfigurer extends PropertyConfigurerSupport
         case "autowiredenabled":
         case "autowiredEnabled": return boolean.class;
         case "constraintvalidatorfactory":
-        case "constraintValidatorFactory": return javax.validation.ConstraintValidatorFactory.class;
+        case "constraintValidatorFactory": return jakarta.validation.ConstraintValidatorFactory.class;
         case "ignorexmlconfiguration":
         case "ignoreXmlConfiguration": return boolean.class;
         case "lazystartproducer":
         case "lazyStartProducer": return boolean.class;
         case "messageinterpolator":
-        case "messageInterpolator": return javax.validation.MessageInterpolator.class;
+        case "messageInterpolator": return jakarta.validation.MessageInterpolator.class;
         case "traversableresolver":
-        case "traversableResolver": return javax.validation.TraversableResolver.class;
+        case "traversableResolver": return jakarta.validation.TraversableResolver.class;
         case "validationproviderresolver":
-        case "validationProviderResolver": return javax.validation.ValidationProviderResolver.class;
+        case "validationProviderResolver": return jakarta.validation.ValidationProviderResolver.class;
         case "validatorfactory":
-        case "validatorFactory": return javax.validation.ValidatorFactory.class;
+        case "validatorFactory": return jakarta.validation.ValidatorFactory.class;
         default: return null;
         }
     }
diff --git a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointConfigurer.java b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointConfigurer.java
index 0eb6d696348..09ce0db0de3 100644
--- a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointConfigurer.java
+++ b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointConfigurer.java
@@ -22,20 +22,20 @@ public class BeanValidatorEndpointConfigurer extends PropertyConfigurerSupport i
         BeanValidatorEndpoint target = (BeanValidatorEndpoint) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "constraintvalidatorfactory":
-        case "constraintValidatorFactory": target.setConstraintValidatorFactory(property(camelContext, javax.validation.ConstraintValidatorFactory.class, value)); return true;
+        case "constraintValidatorFactory": target.setConstraintValidatorFactory(property(camelContext, jakarta.validation.ConstraintValidatorFactory.class, value)); return true;
         case "group": target.setGroup(property(camelContext, java.lang.String.class, value)); return true;
         case "ignorexmlconfiguration":
         case "ignoreXmlConfiguration": target.setIgnoreXmlConfiguration(property(camelContext, boolean.class, value)); return true;
         case "lazystartproducer":
         case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
         case "messageinterpolator":
-        case "messageInterpolator": target.setMessageInterpolator(property(camelContext, javax.validation.MessageInterpolator.class, value)); return true;
+        case "messageInterpolator": target.setMessageInterpolator(property(camelContext, jakarta.validation.MessageInterpolator.class, value)); return true;
         case "traversableresolver":
-        case "traversableResolver": target.setTraversableResolver(property(camelContext, javax.validation.TraversableResolver.class, value)); return true;
+        case "traversableResolver": target.setTraversableResolver(property(camelContext, jakarta.validation.TraversableResolver.class, value)); return true;
         case "validationproviderresolver":
-        case "validationProviderResolver": target.setValidationProviderResolver(property(camelContext, javax.validation.ValidationProviderResolver.class, value)); return true;
+        case "validationProviderResolver": target.setValidationProviderResolver(property(camelContext, jakarta.validation.ValidationProviderResolver.class, value)); return true;
         case "validatorfactory":
-        case "validatorFactory": target.setValidatorFactory(property(camelContext, javax.validation.ValidatorFactory.class, value)); return true;
+        case "validatorFactory": target.setValidatorFactory(property(camelContext, jakarta.validation.ValidatorFactory.class, value)); return true;
         default: return false;
         }
     }
@@ -44,20 +44,20 @@ public class BeanValidatorEndpointConfigurer extends PropertyConfigurerSupport i
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "constraintvalidatorfactory":
-        case "constraintValidatorFactory": return javax.validation.ConstraintValidatorFactory.class;
+        case "constraintValidatorFactory": return jakarta.validation.ConstraintValidatorFactory.class;
         case "group": return java.lang.String.class;
         case "ignorexmlconfiguration":
         case "ignoreXmlConfiguration": return boolean.class;
         case "lazystartproducer":
         case "lazyStartProducer": return boolean.class;
         case "messageinterpolator":
-        case "messageInterpolator": return javax.validation.MessageInterpolator.class;
+        case "messageInterpolator": return jakarta.validation.MessageInterpolator.class;
         case "traversableresolver":
-        case "traversableResolver": return javax.validation.TraversableResolver.class;
+        case "traversableResolver": return jakarta.validation.TraversableResolver.class;
         case "validationproviderresolver":
-        case "validationProviderResolver": return javax.validation.ValidationProviderResolver.class;
+        case "validationProviderResolver": return jakarta.validation.ValidationProviderResolver.class;
         case "validatorfactory":
-        case "validatorFactory": return javax.validation.ValidatorFactory.class;
+        case "validatorFactory": return jakarta.validation.ValidatorFactory.class;
         default: return null;
         }
     }
diff --git a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidationException.java b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidationException.java
index 68b1c58a59d..3df4f1a890e 100644
--- a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidationException.java
+++ b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidationException.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean.validator;
 
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolation;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.ValidationException;
diff --git a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
index 5e37cbff255..ea44fcd57fd 100644
--- a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
+++ b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
@@ -18,11 +18,11 @@ package org.apache.camel.component.bean.validator;
 
 import java.util.Map;
 
-import javax.validation.ConstraintValidatorFactory;
-import javax.validation.MessageInterpolator;
-import javax.validation.TraversableResolver;
-import javax.validation.ValidationProviderResolver;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.ConstraintValidatorFactory;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.TraversableResolver;
+import jakarta.validation.ValidationProviderResolver;
+import jakarta.validation.ValidatorFactory;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
diff --git a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorEndpoint.java b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorEndpoint.java
index 46109559c9a..188010af77a 100644
--- a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorEndpoint.java
+++ b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorEndpoint.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.component.bean.validator;
 
-import javax.validation.ConstraintValidatorFactory;
-import javax.validation.MessageInterpolator;
-import javax.validation.TraversableResolver;
-import javax.validation.ValidationProviderResolver;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.ConstraintValidatorFactory;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.TraversableResolver;
+import jakarta.validation.ValidationProviderResolver;
+import jakarta.validation.ValidatorFactory;
 
 import org.apache.camel.Category;
 import org.apache.camel.Component;
@@ -47,7 +47,7 @@ public class BeanValidatorEndpoint extends DefaultEndpoint {
     @UriPath(description = "Where label is an arbitrary text value describing the endpoint")
     @Metadata(required = true)
     private String label;
-    @UriParam(defaultValue = "javax.validation.groups.Default")
+    @UriParam(defaultValue = "jakarta.validation.groups.Default")
     private String group;
     @UriParam
     private boolean ignoreXmlConfiguration;
diff --git a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorProducer.java b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorProducer.java
index f5f736197b7..7ad8f60ba28 100644
--- a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorProducer.java
+++ b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorProducer.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.bean.validator;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ValidatorFactory;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.support.DefaultProducer;
diff --git a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolver.java b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolver.java
index df0a33bb24a..0751b0f57cf 100644
--- a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolver.java
+++ b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolver.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean.validator;
 
 import java.util.List;
 
-import javax.validation.ValidationProviderResolver;
+import jakarta.validation.ValidationProviderResolver;
 
 import org.hibernate.validator.HibernateValidator;
 
diff --git a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/ValidationProviderResolverFactory.java b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/ValidationProviderResolverFactory.java
index ee4cea7a991..b78a00094d6 100644
--- a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/ValidationProviderResolverFactory.java
+++ b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/ValidationProviderResolverFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.bean.validator;
 
-import javax.validation.ValidationProviderResolver;
+import jakarta.validation.ValidationProviderResolver;
 
 import org.apache.camel.CamelContext;
 
diff --git a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/ValidatorFactories.java b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/ValidatorFactories.java
index 65e238252c8..b088f8ec751 100644
--- a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/ValidatorFactories.java
+++ b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/ValidatorFactories.java
@@ -16,20 +16,20 @@
  */
 package org.apache.camel.component.bean.validator;
 
-import javax.validation.Configuration;
-import javax.validation.ConstraintValidatorFactory;
-import javax.validation.MessageInterpolator;
-import javax.validation.TraversableResolver;
-import javax.validation.Validation;
-import javax.validation.ValidationProviderResolver;
-import javax.validation.ValidatorFactory;
-import javax.validation.bootstrap.GenericBootstrap;
+import jakarta.validation.Configuration;
+import jakarta.validation.ConstraintValidatorFactory;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.TraversableResolver;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidationProviderResolver;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.bootstrap.GenericBootstrap;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.support.CamelContextHelper;
 
 /**
- * Utility class dedicated to create new {@code javax.validation.ValidatorFactory} instances.
+ * Utility class dedicated to create new {@code jakarta.validation.ValidatorFactory} instances.
  */
 public final class ValidatorFactories {
 
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
index 16f741319b2..c3d8beda559 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
@@ -19,12 +19,12 @@ package org.apache.camel.component.bean.validator;
 import java.lang.annotation.ElementType;
 import java.util.Locale;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorFactory;
-import javax.validation.MessageInterpolator;
-import javax.validation.Path;
-import javax.validation.Path.Node;
-import javax.validation.TraversableResolver;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorFactory;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.Path;
+import jakarta.validation.Path.Node;
+import jakarta.validation.TraversableResolver;
 
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.test.junit5.CamelTestSupport;
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java
index d0fb2db3bef..cdfb0036a37 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java
@@ -21,7 +21,7 @@ import java.util.Locale;
 import java.util.Set;
 import java.util.stream.Stream;
 
-import javax.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolation;
 
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.Exchange;
@@ -74,7 +74,7 @@ class BeanValidatorRouteTest extends CamelTestSupport {
     @MethodSource("provideValidCars")
     void validateShouldSuccessWithExpliciteDefaultGroup(Object cars) {
 
-        Exchange exchange = template.request("bean-validator://x?group=javax.validation.groups.Default", new Processor() {
+        Exchange exchange = template.request("bean-validator://x?group=jakarta.validation.groups.Default", new Processor() {
             public void process(Exchange exchange) {
                 exchange.getIn().setBody(cars);
             }
@@ -121,7 +121,7 @@ class BeanValidatorRouteTest extends CamelTestSupport {
     @MethodSource("provideInvalidCarsWithoutLicensePlate")
     void validateShouldFailWithExpliciteDefaultGroup(Object cars, int numberOfViolations) {
 
-        final String url = "bean-validator://x?group=javax.validation.groups.Default";
+        final String url = "bean-validator://x?group=jakarta.validation.groups.Default";
 
         try {
             template.requestBody(url, cars);
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithAnnotations.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithAnnotations.java
index 97dd1891cf9..ea5ced43f48 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithAnnotations.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithAnnotations.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.component.bean.validator;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 public class CarWithAnnotations implements Car {
 
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithRedefinedDefaultGroup.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithRedefinedDefaultGroup.java
index 10e450e8fa0..f9dcfa759d9 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithRedefinedDefaultGroup.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithRedefinedDefaultGroup.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.component.bean.validator;
 
-import javax.validation.GroupSequence;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.GroupSequence;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 @GroupSequence({ CarWithRedefinedDefaultGroup.class, OptionalChecks.class })
 public class CarWithRedefinedDefaultGroup implements Car {
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java
index ce0c2064e19..7fce18c0512 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.bean.validator;
 
 import java.util.List;
 
-import javax.validation.ValidationProviderResolver;
-import javax.validation.spi.ValidationProvider;
+import jakarta.validation.ValidationProviderResolver;
+import jakarta.validation.spi.ValidationProvider;
 
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java
index 0f49882b72a..0f6b4c8e482 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.bean.validator;
 
-import javax.validation.ValidationProviderResolver;
+import jakarta.validation.ValidationProviderResolver;
 
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/OrderedChecks.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/OrderedChecks.java
index df7fd2b3f98..2a5793aae0a 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/OrderedChecks.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/OrderedChecks.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.component.bean.validator;
 
-import javax.validation.GroupSequence;
-import javax.validation.groups.Default;
+import jakarta.validation.GroupSequence;
+import jakarta.validation.groups.Default;
 
 @GroupSequence({ Default.class, OptionalChecks.class })
 public interface OrderedChecks {
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryAutowireTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryAutowireTest.java
index 161a5938b36..ed070a10fb9 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryAutowireTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryAutowireTest.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.component.bean.validator;
 
-import javax.validation.Validation;
-import javax.validation.ValidatorFactory;
-import javax.validation.bootstrap.GenericBootstrap;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.bootstrap.GenericBootstrap;
 
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.test.junit5.CamelTestSupport;
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryRegistryTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryRegistryTest.java
index dc2808ba716..798072b0baa 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryRegistryTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryRegistryTest.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.component.bean.validator;
 
-import javax.validation.Validation;
-import javax.validation.ValidatorFactory;
-import javax.validation.bootstrap.GenericBootstrap;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.bootstrap.GenericBootstrap;
 
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.test.junit5.CamelTestSupport;
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPI.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPI.java
index b76e8a8e0e2..7f85c30fa31 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPI.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPI.java
@@ -20,9 +20,9 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.MediaType;
 
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.component.bonita.api.model.CaseCreationResponse;
@@ -31,7 +31,7 @@ import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
 import org.apache.camel.component.bonita.api.util.BonitaAPIUtil;
 import org.apache.camel.util.ObjectHelper;
 
-import static javax.ws.rs.client.Entity.entity;
+import static jakarta.ws.rs.client.Entity.entity;
 
 public class BonitaAPI {
 
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPIBuilder.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPIBuilder.java
index 311d77c10c3..4e0109b779d 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPIBuilder.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPIBuilder.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.component.bonita.api;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
 
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 import org.apache.camel.component.bonita.api.filter.BonitaAuthFilter;
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/BonitaAuthFilter.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/BonitaAuthFilter.java
index 4160aeac283..25fef8c7b05 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/BonitaAuthFilter.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/BonitaAuthFilter.java
@@ -20,17 +20,17 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Map;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientRequestFilter;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.NewCookie;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.client.ClientRequestFilter;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.NewCookie;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
 import org.apache.camel.util.ObjectHelper;
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/JsonClientFilter.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/JsonClientFilter.java
index 9acc24766da..78467f91afc 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/JsonClientFilter.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/JsonClientFilter.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.bonita.api.filter;
 
 import java.io.IOException;
 
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientResponseContext;
-import javax.ws.rs.client.ClientResponseFilter;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.client.ClientResponseContext;
+import jakarta.ws.rs.client.ClientResponseFilter;
 
 public class JsonClientFilter implements ClientResponseFilter {
 
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtil.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtil.java
index 8761ac54044..e1f08051e36 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtil.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtil.java
@@ -25,10 +25,10 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.MediaType;
 
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 import org.apache.camel.component.bonita.api.filter.BonitaAuthFilter;
@@ -40,7 +40,7 @@ import org.apache.cxf.jaxrs.ext.multipart.Attachment;
 import org.apache.cxf.jaxrs.ext.multipart.AttachmentBuilder;
 import org.apache.cxf.jaxrs.ext.multipart.ContentDisposition;
 
-import static javax.ws.rs.client.Entity.entity;
+import static jakarta.ws.rs.client.Entity.entity;
 
 public class BonitaAPIUtil {
 
diff --git a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterAlreadyConnectedTest.java b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterAlreadyConnectedTest.java
index b2a75f5f582..c8950b69610 100644
--- a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterAlreadyConnectedTest.java
+++ b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterAlreadyConnectedTest.java
@@ -20,8 +20,8 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.core.Cookie;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.core.Cookie;
 
 import org.apache.camel.component.bonita.api.filter.BonitaAuthFilter;
 import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
diff --git a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java
index d272c3eb385..57bc0aefeb1 100644
--- a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java
+++ b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.bonita.api;
 
 import java.util.HashMap;
 
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.core.Cookie;
-import javax.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.core.Cookie;
+import jakarta.ws.rs.core.MultivaluedHashMap;
 
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
diff --git a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterTest.java b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterTest.java
index 2df382c2cf7..4cb9a722c16 100644
--- a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterTest.java
+++ b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.bonita.api;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.core.Cookie;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.core.Cookie;
 
 import org.apache.camel.component.bonita.api.filter.BonitaAuthFilter;
 import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
diff --git a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/MandatoryJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/MandatoryJtaTransactionPolicy.java
index d6af7fa04ef..0fb5dc332b8 100644
--- a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/MandatoryJtaTransactionPolicy.java
+++ b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/MandatoryJtaTransactionPolicy.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.transaction;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 @Named("PROPAGATION_MANDATORY")
 public class MandatoryJtaTransactionPolicy extends TransactionalJtaTransactionPolicy {
diff --git a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NestedJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NestedJtaTransactionPolicy.java
index 7c8394eda4a..6064b161b79 100644
--- a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NestedJtaTransactionPolicy.java
+++ b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NestedJtaTransactionPolicy.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.transaction;
 
-import javax.inject.Named;
-import javax.transaction.Transaction;
+import jakarta.inject.Named;
+import jakarta.transaction.Transaction;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NeverJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NeverJtaTransactionPolicy.java
index 0f9fa6caf87..29eb28d92d9 100644
--- a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NeverJtaTransactionPolicy.java
+++ b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NeverJtaTransactionPolicy.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.transaction;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 @Named("PROPAGATION_NEVER")
 public class NeverJtaTransactionPolicy extends TransactionalJtaTransactionPolicy {
diff --git a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NotSupportedJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NotSupportedJtaTransactionPolicy.java
index 0d5ea37ee39..ce541706427 100644
--- a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NotSupportedJtaTransactionPolicy.java
+++ b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NotSupportedJtaTransactionPolicy.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.transaction;
 
-import javax.inject.Named;
-import javax.transaction.Transaction;
+import jakarta.inject.Named;
+import jakarta.transaction.Transaction;
 
 @Named("PROPAGATION_NOT_SUPPORTED")
 public class NotSupportedJtaTransactionPolicy extends TransactionalJtaTransactionPolicy {
diff --git a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiredJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiredJtaTransactionPolicy.java
index f0bced3087a..cf1ffdbb0ca 100644
--- a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiredJtaTransactionPolicy.java
+++ b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiredJtaTransactionPolicy.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.transaction;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 @Named("PROPAGATION_REQUIRED")
 public class RequiredJtaTransactionPolicy extends TransactionalJtaTransactionPolicy {
diff --git a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiresNewJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiresNewJtaTransactionPolicy.java
index e9d763826d8..90b550d462b 100644
--- a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiresNewJtaTransactionPolicy.java
+++ b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiresNewJtaTransactionPolicy.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.transaction;
 
-import javax.inject.Named;
-import javax.transaction.Transaction;
+import jakarta.inject.Named;
+import jakarta.transaction.Transaction;
 
 @Named("PROPAGATION_REQUIRES_NEW")
 public class RequiresNewJtaTransactionPolicy extends TransactionalJtaTransactionPolicy {
diff --git a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/SupportsJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/SupportsJtaTransactionPolicy.java
index 74bf7e52bca..541281e7a82 100644
--- a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/SupportsJtaTransactionPolicy.java
+++ b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/SupportsJtaTransactionPolicy.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.transaction;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 @Named("PROPAGATION_SUPPORTS")
 public class SupportsJtaTransactionPolicy extends TransactionalJtaTransactionPolicy {
diff --git a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java
index 2f571354d55..388bf8acd13 100644
--- a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java
+++ b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java
@@ -21,13 +21,13 @@ import java.util.stream.Stream;
 
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.RollbackException;
-import javax.transaction.Status;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
+import jakarta.transaction.HeuristicMixedException;
+import jakarta.transaction.HeuristicRollbackException;
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.Status;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.Transaction;
+import jakarta.transaction.TransactionManager;
 
 import org.apache.camel.CamelException;
 import org.apache.camel.jta.JtaTransactionPolicy;
diff --git a/components/camel-cdi-main/src/main/java/org/apache/camel/cdi/Main.java b/components/camel-cdi-main/src/main/java/org/apache/camel/cdi/Main.java
index bfb8b21d9e3..05806922c2e 100644
--- a/components/camel-cdi-main/src/main/java/org/apache/camel/cdi/Main.java
+++ b/components/camel-cdi-main/src/main/java/org/apache/camel/cdi/Main.java
@@ -19,13 +19,13 @@ package org.apache.camel.cdi;
 import java.util.Map;
 import java.util.Set;
 
-import javax.enterprise.context.control.RequestContextController;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.UnsatisfiedResolutionException;
-import javax.enterprise.inject.se.SeContainer;
-import javax.enterprise.inject.se.SeContainerInitializer;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.control.RequestContextController;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.UnsatisfiedResolutionException;
+import jakarta.enterprise.inject.se.SeContainer;
+import jakarta.enterprise.inject.se.SeContainerInitializer;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java
index 0ae285a2dde..d670ea9327f 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java
@@ -21,8 +21,8 @@ import java.lang.reflect.Type;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.Annotated;
 
 import static java.util.stream.Collectors.toSet;
 import static org.apache.camel.cdi.CdiSpiHelper.isAnnotationType;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMemberDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMemberDelegate.java
index 6518ec40512..759fa064780 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMemberDelegate.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMemberDelegate.java
@@ -20,9 +20,9 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.Member;
 import java.util.Set;
 
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.AnnotatedMember;
-import javax.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.AnnotatedMember;
+import jakarta.enterprise.inject.spi.AnnotatedType;
 
 @Vetoed
 class AnnotatedMemberDelegate<T> extends AnnotatedDelegate implements AnnotatedMember<T> {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMethodDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMethodDelegate.java
index 72d16a293db..3aa76ae0fd9 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMethodDelegate.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMethodDelegate.java
@@ -21,9 +21,9 @@ import java.lang.reflect.Method;
 import java.util.List;
 import java.util.Set;
 
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
 
 @Vetoed
 final class AnnotatedMethodDelegate<T> extends AnnotatedMemberDelegate<T> implements AnnotatedMethod<T> {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedTypeDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedTypeDelegate.java
index 1a469a41f87..1fe8406df4e 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedTypeDelegate.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedTypeDelegate.java
@@ -19,11 +19,11 @@ package org.apache.camel.cdi;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.AnnotatedConstructor;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
 
 @Vetoed
 final class AnnotatedTypeDelegate<T> extends AnnotatedDelegate implements AnnotatedType<T> {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ApplicationScopedLiteral.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ApplicationScopedLiteral.java
index 5e707ad2d32..5b316958d59 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ApplicationScopedLiteral.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ApplicationScopedLiteral.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.util.AnnotationLiteral;
 
 @Vetoed
 final class ApplicationScopedLiteral extends AnnotationLiteral<ApplicationScoped> implements ApplicationScoped {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java
index 4111b2861fb..68dfff82528 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java
@@ -22,10 +22,10 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
 
 @Vetoed
 final class BeanDelegate<T> implements Bean<T> {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanManagerHelper.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanManagerHelper.java
index 1609607fde2..22d663920ed 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanManagerHelper.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanManagerHelper.java
@@ -20,8 +20,8 @@ import java.lang.annotation.Annotation;
 import java.util.Optional;
 import java.util.Set;
 
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
 
 import static java.util.stream.Collectors.toSet;
 
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelBeanInjectionTarget.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelBeanInjectionTarget.java
index e9eb003d42c..58eb1db8450 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelBeanInjectionTarget.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelBeanInjectionTarget.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.cdi;
 
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.InjectionException;
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.InjectionException;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionTarget;
 
 @Vetoed
 final class CamelBeanInjectionTarget<T> extends DelegateInjectionTarget<T> implements InjectionTarget<T> {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextInjectionTarget.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextInjectionTarget.java
index b3e7db9e88d..bdcd705ac06 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextInjectionTarget.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextInjectionTarget.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.cdi;
 
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.Producer;
 
 import org.apache.camel.CamelContext;
 
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextProducer.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextProducer.java
index 68b19581c68..f960e2340f3 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextProducer.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextProducer.java
@@ -19,17 +19,17 @@ package org.apache.camel.cdi;
 import java.lang.annotation.Annotation;
 import java.util.Set;
 
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.InjectionException;
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Producer;
-import javax.inject.Named;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.InjectionException;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Producer;
+import jakarta.inject.Named;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.impl.DefaultCamelContext;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
index 2d5839a8225..909976e22c2 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi;
 
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.impl.engine.DefaultCamelBeanPostProcessor;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanRepository.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanRepository.java
index 8fc7cc0a3dd..0009a1aae70 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanRepository.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanRepository.java
@@ -19,9 +19,9 @@ package org.apache.camel.cdi;
 import java.util.Map;
 import java.util.Set;
 
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
 
 import org.apache.camel.component.properties.PropertiesComponent;
 import org.apache.camel.spi.BeanRepository;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelConfigurationEvent.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelConfigurationEvent.java
index 1cef27f786f..0a6bd999649 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelConfigurationEvent.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelConfigurationEvent.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi;
 
-import javax.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.Vetoed;
 
 @Vetoed
 /* package-private */ final class CdiCamelConfigurationEvent implements CdiCamelConfiguration {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelEnvironment.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelEnvironment.java
index f6f76418ea4..9d009032f05 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelEnvironment.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelEnvironment.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.cdi;
 
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.Producer;
 
 import org.apache.camel.CamelContext;
 
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
index 0953d9de5f8..3714418bd95 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
@@ -29,30 +29,30 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 import java.util.stream.Stream;
 
-import javax.enterprise.context.Dependent;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.InjectionException;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import javax.enterprise.inject.spi.ProcessBean;
-import javax.enterprise.inject.spi.ProcessInjectionTarget;
-import javax.enterprise.inject.spi.ProcessObserverMethod;
-import javax.enterprise.inject.spi.ProcessProducer;
-import javax.enterprise.inject.spi.ProcessProducerField;
-import javax.enterprise.inject.spi.ProcessProducerMethod;
-import javax.enterprise.inject.spi.configurator.BeanConfigurator;
-import javax.inject.Named;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.InjectionException;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.AfterDeploymentValidation;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.inject.spi.ProcessBean;
+import jakarta.enterprise.inject.spi.ProcessInjectionTarget;
+import jakarta.enterprise.inject.spi.ProcessObserverMethod;
+import jakarta.enterprise.inject.spi.ProcessProducer;
+import jakarta.enterprise.inject.spi.ProcessProducerField;
+import jakarta.enterprise.inject.spi.ProcessProducerMethod;
+import jakarta.enterprise.inject.spi.configurator.BeanConfigurator;
+import jakarta.inject.Named;
 
 import org.apache.camel.BeanInject;
 import org.apache.camel.CamelContext;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelFactory.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelFactory.java
index 1abad3988c5..68861635040 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelFactory.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelFactory.java
@@ -23,13 +23,13 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Optional;
 
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.InjectionException;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.InjectionException;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.InjectionPoint;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ConsumerTemplate;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelInjector.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelInjector.java
index c6f741ad664..a9c610d41bc 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelInjector.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelInjector.java
@@ -19,8 +19,8 @@ package org.apache.camel.cdi;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.BeanManager;
 
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.Injector;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventComponent.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventComponent.java
index ef2cf111b59..0a182513322 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventComponent.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventComponent.java
@@ -18,8 +18,8 @@ package org.apache.camel.cdi;
 
 import java.util.Map;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.support.DefaultComponent;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventConsumer.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventConsumer.java
index 82f83743675..c3746008ca8 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventConsumer.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventConsumer.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi;
 
-import javax.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.Vetoed;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.ExtendedExchange;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java
index ef5d5c5e3a3..c42793df9c8 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java
@@ -26,13 +26,13 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Stream;
 
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.util.TypeLiteral;
-import javax.inject.Inject;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.util.TypeLiteral;
+import jakarta.inject.Inject;
 
 import org.apache.camel.Consumer;
 import org.apache.camel.Endpoint;
@@ -89,7 +89,7 @@ import static java.util.stream.Collectors.joining;
  * </code>
  * </pre>
  */
-@javax.enterprise.inject.Vetoed
+@jakarta.enterprise.inject.Vetoed
 public final class CdiEventEndpoint<T> extends DefaultEndpoint {
 
     private final List<CdiEventConsumer<T>> consumers = new ArrayList<>();
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java
index f3d7dfe62b0..29ed0d13263 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java
@@ -22,8 +22,8 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.BeanManager;
 
 import org.apache.camel.spi.CamelEvent;
 import org.apache.camel.spi.CamelEvent.RouteEvent;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventProducer.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventProducer.java
index 6c5ea8b31ec..00d1919f60f 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventProducer.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventProducer.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi;
 
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.Vetoed;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.inject.Vetoed;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.support.DefaultProducer;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiSpiHelper.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiSpiHelper.java
index 0ebaf867463..beb03b9a56c 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiSpiHelper.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiSpiHelper.java
@@ -34,17 +34,17 @@ import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMember;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.Nonbinding;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.AnnotatedConstructor;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedMember;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.util.Nonbinding;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.RuntimeCamelException;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateInjectionTarget.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateInjectionTarget.java
index bcd343a8b49..577d13f5b50 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateInjectionTarget.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateInjectionTarget.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.cdi;
 
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.Producer;
 
 abstract class DelegateInjectionTarget<T> extends DelegateProducer<T> implements InjectionTarget<T> {
 
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateProducer.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateProducer.java
index 2d8168c47eb..842e0fbdafe 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateProducer.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateProducer.java
@@ -18,9 +18,9 @@ package org.apache.camel.cdi;
 
 import java.util.Set;
 
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.Producer;
 
 abstract class DelegateProducer<T> implements Producer<T> {
 
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java
index 32a9e2bf5a3..19aaa08d0b1 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java
@@ -20,8 +20,8 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Qualifier;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ForwardingObserverMethod.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ForwardingObserverMethod.java
index 6767d7553b0..29f75e92688 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ForwardingObserverMethod.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ForwardingObserverMethod.java
@@ -20,10 +20,10 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.Set;
 
-import javax.enterprise.event.Reception;
-import javax.enterprise.event.TransactionPhase;
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.ObserverMethod;
+import jakarta.enterprise.event.Reception;
+import jakarta.enterprise.event.TransactionPhase;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.ObserverMethod;
 
 import org.apache.camel.CamelContext;
 
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ImportResource.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ImportResource.java
index 260df7b9456..430dc8a88a4 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ImportResource.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ImportResource.java
@@ -21,7 +21,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.inject.Default;
+import jakarta.enterprise.inject.Default;
 
 /**
  * Indicates one or more resources representing
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ListParameterizedType.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ListParameterizedType.java
index 08ead2c1be3..207c7c3ad15 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ListParameterizedType.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ListParameterizedType.java
@@ -20,7 +20,7 @@ import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.List;
 
-import javax.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.Vetoed;
 
 @Vetoed
 final class ListParameterizedType implements ParameterizedType {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/NamedLiteral.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/NamedLiteral.java
index 71a3d367c73..9ea781b7e13 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/NamedLiteral.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/NamedLiteral.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi;
 
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Named;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Named;
 
 @Vetoed
 final class NamedLiteral extends AnnotationLiteral<Named> implements Named {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Startup.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Startup.java
index 7c7564df17b..670be257359 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Startup.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Startup.java
@@ -21,8 +21,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Qualifier;
 
 /**
  * Can be replaced by an observer: {@code void onStart(@Observes @Initialized(ApplicationScoped) Object start)}.
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticAnnotated.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticAnnotated.java
index f7cf017a718..96c138ff37f 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticAnnotated.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticAnnotated.java
@@ -22,7 +22,7 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.Annotated;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.unmodifiableSet;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java
index c2839021d03..825317bb811 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java
@@ -21,15 +21,15 @@ import java.util.Set;
 import java.util.StringJoiner;
 import java.util.function.Function;
 
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.CreationException;
-import javax.enterprise.inject.InjectionException;
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.CreationException;
+import jakarta.enterprise.inject.InjectionException;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.PassivationCapable;
 
 import static org.apache.camel.cdi.CdiSpiHelper.createBeanId;
 
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBeanAttributes.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBeanAttributes.java
index 7eae85aaa41..7a1d3581915 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBeanAttributes.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBeanAttributes.java
@@ -20,10 +20,10 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.Set;
 
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Named;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Named;
 
 import static java.util.Collections.emptySet;
 import static java.util.stream.Collectors.toSet;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticInjectionTarget.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticInjectionTarget.java
index 852c134c35d..96a945b7f2c 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticInjectionTarget.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticInjectionTarget.java
@@ -21,9 +21,9 @@ import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InjectionTarget;
 
 @Vetoed
 class SyntheticInjectionTarget<T> implements InjectionTarget<T> {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Uri.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Uri.java
index 9cb5494b54a..fc563031dbd 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Uri.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Uri.java
@@ -21,9 +21,9 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.AnnotationLiteral;
-import javax.enterprise.util.Nonbinding;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.inject.Qualifier;
 
 /**
  * A CDI qualifier to define the <a href="http://camel.apache.org/uris.html">Camel URI</a> associated to the annotated
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CamelContextAwareBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CamelContextAwareBean.java
index fe04274d566..f2654165e56 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CamelContextAwareBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CamelContextAwareBean.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.CamelContextAware;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CamelContextProducerMethod.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CamelContextProducerMethod.java
index 3d7917573f1..ae0be596029 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CamelContextProducerMethod.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CamelContextProducerMethod.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.Produces;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.impl.DefaultCamelContext;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ConsumeMethodBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ConsumeMethodBean.java
index d690134560f..199b1e3f384 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ConsumeMethodBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ConsumeMethodBean.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.apache.camel.Body;
 import org.apache.camel.Consume;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CustomLifecycleCamelContext.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CustomLifecycleCamelContext.java
index 9d54efe463e..1c9af419879 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CustomLifecycleCamelContext.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CustomLifecycleCamelContext.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.cdi.CdiCamelContext;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CustomPropertiesCamelContext.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CustomPropertiesCamelContext.java
index 66040ecfa6b..ccdcbbf0fe6 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CustomPropertiesCamelContext.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CustomPropertiesCamelContext.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.apache.camel.impl.DefaultCamelContext;
 
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/DefaultCamelContextBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/DefaultCamelContextBean.java
index 8beeb10b162..ddc56ad71ad 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/DefaultCamelContextBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/DefaultCamelContextBean.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
 
 import org.apache.camel.impl.DefaultCamelContext;
 
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventConsumingRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventConsumingRoute.java
index 288ab88ea89..c48b3d26e29 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventConsumingRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventConsumingRoute.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.CdiEventEndpoint;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventConsumingRouteCdi10.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventConsumingRouteCdi10.java
index d8a4eb3f971..b08a02db8ff 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventConsumingRouteCdi10.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventConsumingRouteCdi10.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.CdiEventEndpoint;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRoute.java
index 48d77a43f2e..1a5a5f15b26 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRoute.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.CdiEventEndpoint;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRouteCdi10.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRouteCdi10.java
index 0c21c26473d..85c4ea8ced5 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRouteCdi10.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRouteCdi10.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.CdiEventEndpoint;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextBean.java
index 876059c12d4..0fee018e5cb 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextBean.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.apache.camel.impl.DefaultCamelContext;
 
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextConvertingRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextConvertingRoute.java
index be2e72f54ba..e71a9b2e033 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextConvertingRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextConvertingRoute.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.pojo.TypeConverterOutput;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEndpointInjectRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEndpointInjectRoute.java
index 6d85c68ba39..e0f54db7d22 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEndpointInjectRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEndpointInjectRoute.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEventConsumingRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEventConsumingRoute.java
index abafe7aea08..ccc8d140e51 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEventConsumingRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEventConsumingRoute.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.CdiEventEndpoint;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEventProducingRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEventProducingRoute.java
index 15a4a0986e5..981debf4c02 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEventProducingRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEventProducingRoute.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.CdiEventEndpoint;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextRoute.java
index f2f9eec40e9..26f2a3395fa 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextRoute.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.apache.camel.builder.RouteBuilder;
 
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstNamedCamelContextBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstNamedCamelContextBean.java
index 9f1e9a97671..cbd59f35425 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstNamedCamelContextBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstNamedCamelContextBean.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
 
 import org.apache.camel.impl.DefaultCamelContext;
 
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstNamedCamelContextRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstNamedCamelContextRoute.java
index 9f105bb576f..9faccefbede 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstNamedCamelContextRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstNamedCamelContextRoute.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.apache.camel.builder.RouteBuilder;
 
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/InjectedEndpointRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/InjectedEndpointRoute.java
index e0ed2268b22..5162f41ec23 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/InjectedEndpointRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/InjectedEndpointRoute.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ManualStartupCamelContext.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ManualStartupCamelContext.java
index 010e7700ed0..9b76e3da2ea 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ManualStartupCamelContext.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ManualStartupCamelContext.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.apache.camel.impl.DefaultCamelContext;
 
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/MockAnnotationRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/MockAnnotationRoute.java
index b9d3ac4e07f..0417790fc7f 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/MockAnnotationRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/MockAnnotationRoute.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/NamedCamelBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/NamedCamelBean.java
index f86bb407b48..ef04e1695bb 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/NamedCamelBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/NamedCamelBean.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 @Named("beanName")
 public class NamedCamelBean {
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/RecipientListMethodBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/RecipientListMethodBean.java
index 48ebacadf7c..1c58c1cefde 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/RecipientListMethodBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/RecipientListMethodBean.java
@@ -19,7 +19,7 @@ package org.apache.camel.cdi.bean;
 import java.util.Arrays;
 import java.util.List;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.apache.camel.Consume;
 import org.apache.camel.RecipientList;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextBean.java
index e7299a77b14..39372fabfc1 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextBean.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
 
 import org.apache.camel.impl.DefaultCamelContext;
 
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextConvertingRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextConvertingRoute.java
index ec6b8eeeac2..77edaa6df96 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextConvertingRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextConvertingRoute.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.pojo.TypeConverterOutput;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEventConsumingRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEventConsumingRoute.java
index 6875e97cfb3..e4d6041a58d 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEventConsumingRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEventConsumingRoute.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.CdiEventEndpoint;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEventProducingRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEventProducingRoute.java
index cb62b02fb42..140841e5872 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEventProducingRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEventProducingRoute.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.CdiEventEndpoint;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondNamedCamelContextBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondNamedCamelContextBean.java
index 960853aac73..0a3802c71cf 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondNamedCamelContextBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondNamedCamelContextBean.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
 
 import org.apache.camel.impl.DefaultCamelContext;
 
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondNamedCamelContextRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondNamedCamelContextRoute.java
index 6bb964280e1..b5fa0c6aa7a 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondNamedCamelContextRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondNamedCamelContextRoute.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
 
 import org.apache.camel.builder.RouteBuilder;
 
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SimpleCamelRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SimpleCamelRoute.java
index 15beaf48e8f..81b15fcd746 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SimpleCamelRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SimpleCamelRoute.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/UriEndpointRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/UriEndpointRoute.java
index 3bc2b5c0320..eb3c5618af8 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/UriEndpointRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/UriEndpointRoute.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.apache.camel.builder.RouteBuilder;
 
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/converter/InjectedTestTypeConverter.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/converter/InjectedTestTypeConverter.java
index 8c0b348ea69..a4fd1f1176a 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/converter/InjectedTestTypeConverter.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/converter/InjectedTestTypeConverter.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.converter;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Converter;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/BarQualifier.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/BarQualifier.java
index ff35f1864ca..7dd5cddd6a5 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/BarQualifier.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/BarQualifier.java
@@ -20,8 +20,8 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Qualifier;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/FooQualifier.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/FooQualifier.java
index 5df8a8065b0..d7a41d679ac 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/FooQualifier.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/FooQualifier.java
@@ -20,8 +20,8 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Qualifier;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/Manual.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/Manual.java
index adf176fbbe0..e662165c178 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/Manual.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/Manual.java
@@ -20,7 +20,7 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/routetemplate/MyRouteCreatorBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/routetemplate/MyRouteCreatorBean.java
index 720b4fe70c2..c1490bb5b10 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/routetemplate/MyRouteCreatorBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/routetemplate/MyRouteCreatorBean.java
@@ -19,9 +19,9 @@ package org.apache.camel.cdi.routetemplate;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.spi.CamelEvent;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/routetemplate/RouteTemplateTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/routetemplate/RouteTemplateTest.java
index c93013cdc35..869942d3141 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/routetemplate/RouteTemplateTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/routetemplate/RouteTemplateTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.routetemplate;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/templatedroute/TemplatedRouteTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/templatedroute/TemplatedRouteTest.java
index b5e6b16b821..ccd77b8bea4 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/templatedroute/TemplatedRouteTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/templatedroute/TemplatedRouteTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.templatedroute;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedMockEndpointProducerTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedMockEndpointProducerTest.java
index c99f7d65950..f342147839c 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedMockEndpointProducerTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedMockEndpointProducerTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedRouteTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedRouteTest.java
index 7514d092ecf..7cbe6756f38 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedRouteTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedRouteTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.cdi.test;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.AdviceWith;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/BeanInjectTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/BeanInjectTest.java
index 2fc33d9d7bd..efe65d06dbb 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/BeanInjectTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/BeanInjectTest.java
@@ -18,10 +18,10 @@ package org.apache.camel.cdi.test;
 
 import java.util.Properties;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.camel.cdi.CdiCamelExtension;
 import org.apache.camel.cdi.bean.BeanInjectBean;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/Camel9973Test.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/Camel9973Test.java
index 656f6ea5100..74e807e4744 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/Camel9973Test.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/Camel9973Test.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.cdi.test;
 
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextAwareTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextAwareTest.java
index 32582888336..9d907f877ea 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextAwareTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextAwareTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.test;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.cdi.CdiCamelExtension;
 import org.apache.camel.cdi.bean.CamelContextAwareBean;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextProducerFieldTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextProducerFieldTest.java
index 4d9c210d10c..0a55ca67cab 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextProducerFieldTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextProducerFieldTest.java
@@ -18,10 +18,10 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextProducerMethodTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextProducerMethodTest.java
index 311d67c5b46..8bd4abf8e54 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextProducerMethodTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextProducerMethodTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventEndpointTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventEndpointTest.java
index b4ed2ad87b1..a87d494df09 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventEndpointTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventEndpointTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.EventObject;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
index 7b0a913a52c..fbc9d8e1522 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
@@ -20,10 +20,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelRouteEventNotifierTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelRouteEventNotifierTest.java
index e25e9ef38ad..30bd2d057d3 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelRouteEventNotifierTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelRouteEventNotifierTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.cdi.test;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Named;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CdiCamelConfigurationTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CdiCamelConfigurationTest.java
index c7c343858e8..521c561f87c 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CdiCamelConfigurationTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CdiCamelConfigurationTest.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.test;
 
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.cdi.CdiCamelConfiguration;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ConsumeMethodTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ConsumeMethodTest.java
index e8186e84195..e876b298f41 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ConsumeMethodTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ConsumeMethodTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ConsumerTemplateTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ConsumerTemplateTest.java
index 3b1337a75e5..2cc802237f2 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ConsumerTemplateTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ConsumerTemplateTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ConsumerTemplate;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ContextComponentTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ContextComponentTest.java
index 4036093b6d1..43f055e4ef5 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ContextComponentTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ContextComponentTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CustomCamelContextTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CustomCamelContextTest.java
index 74c3975dd03..ce3621179cb 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CustomCamelContextTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CustomCamelContextTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DefaultCamelContextTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DefaultCamelContextTest.java
index c6613b74afa..b4d1d4e64a3 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DefaultCamelContextTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DefaultCamelContextTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DefaultProducerTemplateTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DefaultProducerTemplateTest.java
index fa0844ef492..efea67bc0ac 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DefaultProducerTemplateTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DefaultProducerTemplateTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DeploymentDescriptorTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DeploymentDescriptorTest.java
index 3931e8ddd54..2dd5bd3ea43 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DeploymentDescriptorTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DeploymentDescriptorTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EndpointInjectTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EndpointInjectTest.java
index 6b98fe31301..b5b5ce913ca 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EndpointInjectTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EndpointInjectTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventComponentTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventComponentTest.java
index 3e2070f15d3..c292c4a4958 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventComponentTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventComponentTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.test;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventEndpointCdi12Test.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventEndpointCdi12Test.java
index e30914bddab..c3dfb84fc2b 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventEndpointCdi12Test.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventEndpointCdi12Test.java
@@ -20,12 +20,12 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Default;
-import javax.enterprise.util.TypeLiteral;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.util.TypeLiteral;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventEndpointTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventEndpointTest.java
index 54f891475e0..72a1c07688f 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventEndpointTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventEndpointTest.java
@@ -20,11 +20,11 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Default;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/InjectedEndpointTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/InjectedEndpointTest.java
index 821ce5f3f02..bba3351f969 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/InjectedEndpointTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/InjectedEndpointTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/InjectedTypeConverterTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/InjectedTypeConverterTest.java
index 1cce06ed6f0..83bbdda331e 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/InjectedTypeConverterTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/InjectedTypeConverterTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.cdi.test;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Named;
 
 import org.apache.camel.NoTypeConversionAvailableException;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ManualCamelContextTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ManualCamelContextTest.java
index 43595619f11..09b63fb0bc9 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ManualCamelContextTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ManualCamelContextTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/MockEndpointTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/MockEndpointTest.java
index 93ba06a7a9f..0a8ac65404f 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/MockEndpointTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/MockEndpointTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NamedCamelContextTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NamedCamelContextTest.java
index a8a5545149f..90cc36fec54 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NamedCamelContextTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NamedCamelContextTest.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.cdi.test;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Named;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NoCamelContextTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NoCamelContextTest.java
index 2e14383b3e7..0ace791807a 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NoCamelContextTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NoCamelContextTest.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.cdi.test;
 
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NoTCCLSetTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NoTCCLSetTest.java
index 063cd1a9fd4..da993b6da35 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NoTCCLSetTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NoTCCLSetTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.cdi.test;
 
 import java.util.Set;
 
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ExtendedCamelContext;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ProgrammaticLookupTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ProgrammaticLookupTest.java
index a9fe9866fbb..38704fdbcf0 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ProgrammaticLookupTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ProgrammaticLookupTest.java
@@ -18,9 +18,9 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertiesLocationTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertiesLocationTest.java
index 32bcfd038aa..9db8ea6abd4 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertiesLocationTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertiesLocationTest.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.cdi.test;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Named;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertyEndpointTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertyEndpointTest.java
index 7bac2e55c07..2e0e3109d2c 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertyEndpointTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertyEndpointTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.cdi.test;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertyInjectTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertyInjectTest.java
index a41c79b2c20..38eb7e510b9 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertyInjectTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertyInjectTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.cdi.test;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Named;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/QualifiedCamelContextTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/QualifiedCamelContextTest.java
index bf655109611..75674d6a818 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/QualifiedCamelContextTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/QualifiedCamelContextTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/RawEventEndpointCdi12Test.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/RawEventEndpointCdi12Test.java
index 0ffdbb55ba5..3762f56df18 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/RawEventEndpointCdi12Test.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/RawEventEndpointCdi12Test.java
@@ -18,10 +18,10 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/RecipientListMethodTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/RecipientListMethodTest.java
index ddd1d9d24f4..1212f77354f 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/RecipientListMethodTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/RecipientListMethodTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UndefinedPropertyTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UndefinedPropertyTest.java
index eb15a250557..6c05fc2621e 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UndefinedPropertyTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UndefinedPropertyTest.java
@@ -18,9 +18,9 @@ package org.apache.camel.cdi.test;
 
 import java.util.Properties;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Named;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextBeanTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextBeanTest.java
index d71c61ed3d8..f5b42d31c43 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextBeanTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextBeanTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextProducerFieldTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextProducerFieldTest.java
index febdc78e2b9..5306ca2e91f 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextProducerFieldTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextProducerFieldTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextProducerMethodTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextProducerMethodTest.java
index 637bb583611..f36dc1cfb80 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextProducerMethodTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextProducerMethodTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriEndpointTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriEndpointTest.java
index 3ff1ddd021a..0333ff03005 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriEndpointTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriEndpointTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriQualifierWithContextTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriQualifierWithContextTest.java
index f81d2355005..8fff717ad61 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriQualifierWithContextTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriQualifierWithContextTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriWithWrongContextTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriWithWrongContextTest.java
index 76e0a87fbd4..47e9b227fb2 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriWithWrongContextTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriWithWrongContextTest.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.test;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMComponent.java b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMComponent.java
index 55cd3239bc3..f13cdb8728f 100644
--- a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMComponent.java
+++ b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMComponent.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.cm;
 import java.util.Map;
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
diff --git a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMConfiguration.java b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMConfiguration.java
index d5091845636..576ec928df1 100644
--- a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMConfiguration.java
+++ b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMConfiguration.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.component.cm;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
diff --git a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMProducer.java b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMProducer.java
index f6b4684ce02..9a28f0572cd 100644
--- a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMProducer.java
+++ b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMProducer.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.cm;
 
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validator;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.InvalidPayloadRuntimeException;
diff --git a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/client/SMSMessage.java b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/client/SMSMessage.java
index dfbda1f6b94..2918918dc9e 100644
--- a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/client/SMSMessage.java
+++ b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/client/SMSMessage.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.component.cm.client;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 
 import org.apache.camel.component.cm.validation.constraints.E164;
 
diff --git a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/validation/constraints/E164.java b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/validation/constraints/E164.java
index 79e3124228e..2eaa6aca77c 100644
--- a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/validation/constraints/E164.java
+++ b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/validation/constraints/E164.java
@@ -22,8 +22,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 @Target({
         ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER,
diff --git a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/validation/constraints/E164Validator.java b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/validation/constraints/E164Validator.java
index cdc4293c60d..695ea5a2791 100644
--- a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/validation/constraints/E164Validator.java
+++ b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/validation/constraints/E164Validator.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.component.cm.validation.constraints;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 
 import com.google.i18n.phonenumbers.NumberParseException;
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
diff --git a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMConfigurationTest.java b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMConfigurationTest.java
index 2b0082887dc..a85dfb72dd5 100644
--- a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMConfigurationTest.java
+++ b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMConfigurationTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.cm.test;
 import java.util.Set;
 import java.util.UUID;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validator;
 
 import org.apache.camel.component.cm.CMConfiguration;
 import org.apache.camel.test.spring.junit5.CamelSpringTest;
diff --git a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/SMSMessageTest.java b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/SMSMessageTest.java
index af880c19340..f44173f3e5a 100644
--- a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/SMSMessageTest.java
+++ b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/SMSMessageTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.cm.test;
 
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validator;
 
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
 import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat;
diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
index e256d623515..12f5338d5d3 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
@@ -23,7 +23,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.DispatcherType;
+import jakarta.servlet.DispatcherType;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.SSLContextParametersAware;
diff --git a/components/camel-cxf/camel-cxf-common/src/generated/java/org/apache/camel/component/cxf/converter/CxfConverterLoader.java b/components/camel-cxf/camel-cxf-common/src/generated/java/org/apache/camel/component/cxf/converter/CxfConverterLoader.java
index 993c8b54973..791c8a542e1 100644
--- a/components/camel-cxf/camel-cxf-common/src/generated/java/org/apache/camel/component/cxf/converter/CxfConverterLoader.java
+++ b/components/camel-cxf/camel-cxf-common/src/generated/java/org/apache/camel/component/cxf/converter/CxfConverterLoader.java
@@ -42,12 +42,12 @@ public final class CxfConverterLoader implements TypeConverterLoader, CamelConte
     }
 
     private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, java.io.InputStream.class, javax.xml.soap.SOAPMessage.class, false,
-            (type, exchange, value) -> org.apache.camel.component.cxf.converter.CxfConverter.soapMessageToInputStream((javax.xml.soap.SOAPMessage) value, exchange));
+        addTypeConverter(registry, java.io.InputStream.class, jakarta.xml.soap.SOAPMessage.class, false,
+            (type, exchange, value) -> org.apache.camel.component.cxf.converter.CxfConverter.soapMessageToInputStream((jakarta.xml.soap.SOAPMessage) value, exchange));
         addTypeConverter(registry, java.lang.Object[].class, java.lang.Object.class, false,
             (type, exchange, value) -> org.apache.camel.component.cxf.converter.CxfConverter.toArray(value));
-        addTypeConverter(registry, java.lang.String.class, javax.xml.soap.SOAPMessage.class, false,
-            (type, exchange, value) -> org.apache.camel.component.cxf.converter.CxfConverter.soapMessageToString((javax.xml.soap.SOAPMessage) value, exchange));
+        addTypeConverter(registry, java.lang.String.class, jakarta.xml.soap.SOAPMessage.class, false,
+            (type, exchange, value) -> org.apache.camel.component.cxf.converter.CxfConverter.soapMessageToString((jakarta.xml.soap.SOAPMessage) value, exchange));
         addTypeConverter(registry, javax.xml.namespace.QName.class, java.lang.String.class, false,
             (type, exchange, value) -> org.apache.camel.component.cxf.converter.CxfConverter.toQName((java.lang.String) value));
         addTypeConverter(registry, org.apache.camel.component.cxf.common.DataFormat.class, java.lang.String.class, false,
diff --git a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/CxfBinding.java b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/CxfBinding.java
index 4a3f610757f..001cedbcf6d 100644
--- a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/CxfBinding.java
+++ b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/CxfBinding.java
@@ -119,7 +119,7 @@ public interface CxfBinding {
 
     /**
      * <p>
-     * Extract the message headers which key are start from javax.xml.ws* from the CXF exchange's inMessage, and put
+     * Extract the message headers which key are start from jakarta.xml.ws* from the CXF exchange's inMessage, and put
      * these headers into the context
      * </p>
      * 
@@ -131,7 +131,7 @@ public interface CxfBinding {
 
     /**
      * <p>
-     * Copy the javax.xml.ws* headers into cxfExchange's outMessage, if the cxfExchange has no outMessage, skip this
+     * Copy the jakarta.xml.ws* headers into cxfExchange's outMessage, if the cxfExchange has no outMessage, skip this
      * copy
      * </p>
      * 
diff --git a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/message/CxfConstants.java b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/message/CxfConstants.java
index 31591ba8b33..f7210e2ce15 100644
--- a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/message/CxfConstants.java
+++ b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/message/CxfConstants.java
@@ -99,9 +99,9 @@ public final class CxfConstants {
     public static final String CAMEL_CXF_ATTACHMENTS = "CamelAttachments";
     public static final String CAMEL_CXF_RS_THROW_EXCEPTION_ON_FAILURE = "CamelCxfRsThrowExceptionOnFailure";
 
-    public static final String WSA_HEADERS_INBOUND = "javax.xml.ws.addressing.context.inbound";
+    public static final String WSA_HEADERS_INBOUND = "jakarta.xml.ws.addressing.context.inbound";
 
-    public static final String WSA_HEADERS_OUTBOUND = "javax.xml.ws.addressing.context.outbound";
+    public static final String WSA_HEADERS_OUTBOUND = "jakarta.xml.ws.addressing.context.outbound";
 
     public static final String CAMEL_CXF_PROTOCOL_HEADERS_MERGED = "CamelCxfProtocolHeadersMerged";
 
diff --git a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
index db5dba3727a..3944bfeabb1 100644
--- a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
+++ b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
@@ -22,8 +22,8 @@ import java.io.InputStream;
 import java.util.Collection;
 
 import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.SOAPException;
+import jakarta.xml.soap.SOAPMessage;
 
 import org.apache.camel.Converter;
 import org.apache.camel.Exchange;
diff --git a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/util/ReaderInputStream.java b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/util/ReaderInputStream.java
index 4a6c334ae6b..a9df704eb62 100644
--- a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/util/ReaderInputStream.java
+++ b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/util/ReaderInputStream.java
@@ -60,7 +60,7 @@ import static org.apache.camel.util.BufferCaster.cast;
  * this class is an indication of a flaw in the design of the code. This class is typically used in situations where an
  * existing API only accepts an {@link InputStream}, but where the most natural way to produce the data is as a
  * character stream, i.e. by providing a {@link Reader} instance. An example of a situation where this problem may
- * appear is when implementing the {@link javax.activation.DataSource} interface from the Java Activation Framework.
+ * appear is when implementing the {@link jakarta.activation.DataSource} interface from the Java Activation Framework.
  * <p>
  * Given the fact that the {@link Reader} class doesn't provide any way to predict whether the next read operation will
  * block or not, it is not possible to provide a meaningful implementation of the {@link InputStream#available()}
diff --git a/components/camel-cxf/camel-cxf-rest/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfConverterLoader.java b/components/camel-cxf/camel-cxf-rest/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfConverterLoader.java
index a75262a6996..a55439fe762 100644
--- a/components/camel-cxf/camel-cxf-rest/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfConverterLoader.java
+++ b/components/camel-cxf/camel-cxf-rest/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfConverterLoader.java
@@ -42,14 +42,14 @@ public final class CxfConverterLoader implements TypeConverterLoader, CamelConte
     }
 
     private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, java.io.InputStream.class, javax.ws.rs.core.Response.class, false,
-            (type, exchange, value) -> org.apache.camel.component.cxf.jaxrs.CxfConverter.toInputStream((javax.ws.rs.core.Response) value, exchange));
-        addTypeConverter(registry, java.io.InputStream.class, javax.xml.soap.SOAPMessage.class, false,
-            (type, exchange, value) -> org.apache.camel.component.cxf.jaxrs.CxfConverter.soapMessageToInputStream((javax.xml.soap.SOAPMessage) value, exchange));
+        addTypeConverter(registry, java.io.InputStream.class, jakarta.ws.rs.core.Response.class, false,
+            (type, exchange, value) -> org.apache.camel.component.cxf.jaxrs.CxfConverter.toInputStream((jakarta.ws.rs.core.Response) value, exchange));
+        addTypeConverter(registry, java.io.InputStream.class, jakarta.xml.soap.SOAPMessage.class, false,
+            (type, exchange, value) -> org.apache.camel.component.cxf.jaxrs.CxfConverter.soapMessageToInputStream((jakarta.xml.soap.SOAPMessage) value, exchange));
         addTypeConverter(registry, java.lang.Object[].class, java.lang.Object.class, false,
             (type, exchange, value) -> org.apache.camel.component.cxf.jaxrs.CxfConverter.toArray(value));
-        addTypeConverter(registry, java.lang.String.class, javax.xml.soap.SOAPMessage.class, false,
-            (type, exchange, value) -> org.apache.camel.component.cxf.jaxrs.CxfConverter.soapMessageToString((javax.xml.soap.SOAPMessage) value, exchange));
+        addTypeConverter(registry, java.lang.String.class, jakarta.xml.soap.SOAPMessage.class, false,
+            (type, exchange, value) -> org.apache.camel.component.cxf.jaxrs.CxfConverter.soapMessageToString((jakarta.xml.soap.SOAPMessage) value, exchange));
         addTypeConverter(registry, javax.xml.namespace.QName.class, java.lang.String.class, false,
             (type, exchange, value) -> org.apache.camel.component.cxf.jaxrs.CxfConverter.toQName((java.lang.String) value));
         addTypeConverter(registry, org.apache.camel.component.cxf.common.DataFormat.class, java.lang.String.class, false,
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfConverter.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfConverter.java
index 6bc8b29a1c5..ee34cb91647 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfConverter.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfConverter.java
@@ -21,10 +21,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collection;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.SOAPException;
+import jakarta.xml.soap.SOAPMessage;
 
 import org.apache.camel.Converter;
 import org.apache.camel.Exchange;
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java
index ceb0269d697..d273aecee99 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.cxf.jaxrs;
 import java.lang.reflect.Method;
 import java.util.Map;
 
-import javax.ws.rs.client.AsyncInvoker;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.client.AsyncInvoker;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.MultivaluedMap;
 
 import org.apache.cxf.message.Exchange;
 
@@ -112,7 +112,7 @@ public interface CxfRsBinding {
 
     /**
      * Bind the Camel message to a request {@link Entity} that gets passed to
-     * {@link AsyncInvoker#method(java.lang.String, javax.ws.rs.client.Entity, javax.ws.rs.client.InvocationCallback)}.
+     * {@link AsyncInvoker#method(java.lang.String, jakarta.ws.rs.client.Entity, jakarta.ws.rs.client.InvocationCallback)}.
      *
      * @param  camelMessage  the source message
      * @param  camelExchange the Camel exchange
@@ -126,7 +126,7 @@ public interface CxfRsBinding {
 
     /**
      * Bind the Camel message to a request {@link Entity} that gets passed to
-     * {@link AsyncInvoker#method(java.lang.String, javax.ws.rs.client.Entity, javax.ws.rs.client.InvocationCallback)}.
+     * {@link AsyncInvoker#method(java.lang.String, jakarta.ws.rs.client.Entity, jakarta.ws.rs.client.InvocationCallback)}.
      *
      * @param  camelMessage  the source message
      * @param  camelExchange the Camel exchange
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
index 8e8a2d8d321..0254077c98b 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
@@ -18,11 +18,11 @@ package org.apache.camel.component.cxf.jaxrs;
 
 import java.lang.reflect.Method;
 
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.Request;
-import javax.ws.rs.core.SecurityContext;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.Request;
+import jakarta.ws.rs.core.SecurityContext;
+import jakarta.ws.rs.core.UriInfo;
 
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.ExchangePattern;
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
index ae06e33ebca..9e9ca28c789 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
@@ -30,13 +30,13 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.InvocationCallback;
-import javax.ws.rs.client.ResponseProcessingException;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.NewCookie;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.InvocationCallback;
+import jakarta.ws.rs.client.ResponseProcessingException;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.NewCookie;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.CamelExchangeException;
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DataFormatProvider.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DataFormatProvider.java
index a2dbf96c121..751564f0bb0 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DataFormatProvider.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DataFormatProvider.java
@@ -24,13 +24,13 @@ import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.InternalServerErrorException;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.ext.MessageBodyReader;
-import javax.ws.rs.ext.MessageBodyWriter;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.InternalServerErrorException;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.ext.MessageBodyReader;
+import jakarta.ws.rs.ext.MessageBodyWriter;
 
 import org.apache.camel.spi.DataFormat;
 import org.apache.cxf.jaxrs.utils.JAXRSUtils;
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
index abf9ce60650..9970c2fcbc3 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
@@ -26,12 +26,12 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import javax.security.auth.Subject;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Variant;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Variant;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePropertyKey;
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultModelResource.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultModelResource.java
index 85138d911f2..0d6a6e06846 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultModelResource.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultModelResource.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.component.cxf.jaxrs;
 
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.cxf.jaxrs.ext.DefaultMethod;
 
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java
index 82bb49c1217..2be412b4c82 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java
@@ -29,18 +29,18 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.activation.DataHandler;
-import javax.activation.DataSource;
-import javax.ws.rs.CookieParam;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.MatrixParam;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.Response.Status;
+import jakarta.activation.DataHandler;
+import jakarta.activation.DataSource;
+import jakarta.ws.rs.CookieParam;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.MatrixParam;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.core.Response.Status;
 
 import org.apache.camel.Message;
 import org.apache.camel.attachment.AttachmentMessage;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java
index fa121a36c75..e9a2b427f91 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.component.cxf.jaxrs;
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
 
 import org.apache.camel.component.cxf.jaxrs.testbean.CustomException;
 
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsBindingConfigurationSelectionTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsBindingConfigurationSelectionTest.java
index 0ae28986eba..171d9b38aa6 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsBindingConfigurationSelectionTest.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsBindingConfigurationSelectionTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.cxf.jaxrs;
 import java.lang.reflect.Method;
 import java.util.Map;
 
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.MultivaluedMap;
 
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.Exchange;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConvertBodyToTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConvertBodyToTest.java
index 7d111c10d09..da32417f645 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConvertBodyToTest.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConvertBodyToTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.jaxrs;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.cxf.common.CXFTestSupport;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerEndpointConfigurerTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerEndpointConfigurerTest.java
index 06c28bdf89b..64c316aeb3c 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerEndpointConfigurerTest.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerEndpointConfigurerTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.jaxrs;
 
-import javax.ws.rs.HttpMethod;
+import jakarta.ws.rs.HttpMethod;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHttpMethodHeaderTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHttpMethodHeaderTest.java
index 77529efa765..94a459bd53c 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHttpMethodHeaderTest.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHttpMethodHeaderTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.jaxrs;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/DataFormatProviderTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/DataFormatProviderTest.java
index 6c346ac1eba..382eab76ebd 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/DataFormatProviderTest.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/DataFormatProviderTest.java
@@ -22,7 +22,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.annotation.Annotation;
 
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MediaType;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.spi.DataFormat;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java
index 8df91cb1f2f..3e1fd441704 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding;
 
 import java.io.StringWriter;
 
-import javax.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBContext;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
index b30a619bf69..767019c9498 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
@@ -23,8 +23,8 @@ import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.activation.DataHandler;
-import javax.xml.bind.JAXBContext;
+import jakarta.activation.DataHandler;
+import jakarta.xml.bind.JAXBContext;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Customer.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Customer.java
index 3a2f12fe823..8f79c6a6775 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Customer.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Customer.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 import org.apache.camel.util.ObjectHelper;
 
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerList.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerList.java
index 10c86f96ad2..fbbd2d071f9 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerList.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerList.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
 
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "CustomerList")
 public class CustomerList {
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerService.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerService.java
index 5b5eb2b5983..83451610262 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerService.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerService.java
@@ -18,15 +18,15 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
 
 import java.io.InputStream;
 
-import javax.activation.DataHandler;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
+import jakarta.activation.DataHandler;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.camel.component.cxf.jaxrs.testbean.Customer;
 
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceImpl.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceImpl.java
index 5dc1e4f88a2..363f989ac8f 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceImpl.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceImpl.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
 
 import java.io.InputStream;
 
-import javax.activation.DataHandler;
-import javax.ws.rs.core.Response;
+import jakarta.activation.DataHandler;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.camel.component.cxf.jaxrs.testbean.Customer;
 
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceResource.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceResource.java
index 2a2d8563f6a..a7b2da9f58a 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceResource.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceResource.java
@@ -18,15 +18,15 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
 
 import java.io.InputStream;
 
-import javax.activation.DataHandler;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
+import jakarta.activation.DataHandler;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.camel.component.cxf.jaxrs.testbean.Customer;
 
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java
index f1c043f0eda..5b62e0d0312 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java
@@ -16,12 +16,12 @@
  */
 package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
 
-import javax.activation.DataHandler;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
+import jakarta.activation.DataHandler;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.cxf.jaxrs.ext.multipart.Multipart;
 
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java
index 9b427a5085a..1ab8c5af88c 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "Order")
 public class Order {
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Product.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Product.java
index 3731cefdb56..69bb31724f9 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Product.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Product.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "Product")
 public class Product {
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/VipCustomerResource.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/VipCustomerResource.java
index d7e02c90a49..b435e958fdb 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/VipCustomerResource.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/VipCustomerResource.java
@@ -16,13 +16,13 @@
  */
 package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
 
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
 
 public class VipCustomerResource {
 
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java
index e0b740c8761..f00deb6bb74 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.jaxrs.testbean;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 import org.apache.camel.util.ObjectHelper;
 
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
index c30fd82dd79..ae95e743fe7 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
@@ -22,15 +22,15 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.cxf.common.util.StringUtils;
 
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java
index e36313746a1..652fbe70ab8 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java
@@ -16,13 +16,13 @@
  */
 package org.apache.camel.component.cxf.jaxrs.testbean;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Response;
 
 // START SNIPPET: example
 @Path("/customerservice/")
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/EchoService.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/EchoService.java
index abba335cd10..5aac219f469 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/EchoService.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/EchoService.java
@@ -16,13 +16,13 @@
  */
 package org.apache.camel.component.cxf.jaxrs.testbean;
 
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Cookie;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.NewCookie;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Cookie;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.NewCookie;
+import jakarta.ws.rs.core.Response;
 
 @Path("/echoservice/")
 public class EchoService {
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
index 0ac90a8e5bc..4e67a93d787 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.cxf.jaxrs.testbean;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "Order")
 public class Order {
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java
index d363af1055e..94f26b5256d 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.jaxrs.testbean;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "Product")
 public class Product {
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
index 5e72b235b32..7c9132244e6 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.cxf.feature;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.SOAPMessage;
 import javax.xml.transform.Source;
 
 import org.apache.camel.component.cxf.interceptors.CxfMessageSoapHeaderOutInterceptor;
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java
index 3d227085777..e548632ac11 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.interceptors;
 
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.SOAPMessage;
 
 import org.apache.cxf.binding.soap.SoapMessage;
 import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor;
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfConsumer.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfConsumer.java
index d81bcebb997..27cf41bf46b 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfConsumer.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfConsumer.java
@@ -20,7 +20,7 @@ import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.xml.ws.WebFault;
+import jakarta.xml.ws.WebFault;
 
 import org.w3c.dom.Element;
 
@@ -297,7 +297,7 @@ public class CxfConsumer extends DefaultConsumer implements Suspendable {
             }
             // bind the CXF request into a Camel exchange
             binding.populateExchangeFromCxfRequest(cxfExchange, camelExchange);
-            // extract the javax.xml.ws header
+            // extract the jakarta.xml.ws header
             Map<String, Object> context = new HashMap<>();
             binding.extractJaxWsContext(cxfExchange, context);
             // put the context into camelExchange
@@ -326,7 +326,7 @@ public class CxfConsumer extends DefaultConsumer implements Suspendable {
             // check failure again as fault could be discovered by converter
             checkFailure(camelExchange, cxfExchange);
 
-            // copy the headers javax.xml.ws header back
+            // copy the headers jakarta.xml.ws header back
             binding.copyJaxWsContext(cxfExchange, (Map<String, Object>) camelExchange.getProperty(CxfConstants.JAXWS_CONTEXT));
         }
 
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java
index b7bcadfa0c8..fbdc5a02d53 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java
@@ -39,9 +39,9 @@ import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stax.StAXSource;
 import javax.xml.transform.stream.StreamSource;
-import javax.xml.ws.Provider;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.handler.Handler;
+import jakarta.xml.ws.Provider;
+import jakarta.xml.ws.WebServiceProvider;
+import jakarta.xml.ws.handler.Handler;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpointUtils.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpointUtils.java
index dff7a9d8020..331c3a2b31f 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpointUtils.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpointUtils.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.cxf.jaxws;
 
 import java.lang.annotation.Annotation;
 
-import javax.jws.WebService;
+import jakarta.jws.WebService;
 import javax.xml.namespace.QName;
-import javax.xml.ws.WebServiceProvider;
+import jakarta.xml.ws.WebServiceProvider;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.CamelException;
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java
index 4ca7d58ba57..576385a63dd 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java
@@ -26,8 +26,8 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.Holder;
-import javax.xml.ws.handler.MessageContext.Scope;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.handler.MessageContext.Scope;
 
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.Exchange;
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java
index 0d5abb73da3..b84e01f2324 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java
@@ -34,13 +34,13 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
 import javax.security.auth.Subject;
 import javax.xml.XMLConstants;
 import javax.xml.namespace.QName;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -1069,7 +1069,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
     public void extractJaxWsContext(org.apache.cxf.message.Exchange cxfExchange, Map<String, Object> context) {
         org.apache.cxf.message.Message inMessage = cxfExchange.getInMessage();
         for (Map.Entry<String, Object> entry : inMessage.entrySet()) {
-            if (entry.getKey().startsWith("javax.xml.ws")) {
+            if (entry.getKey().startsWith("jakarta.xml.ws")) {
                 context.put(entry.getKey(), entry.getValue());
             }
         }
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultPayloadProviderSEI.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultPayloadProviderSEI.java
index 891c49c9f5f..3ce6657e23d 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultPayloadProviderSEI.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultPayloadProviderSEI.java
@@ -18,12 +18,12 @@
 package org.apache.camel.component.cxf.jaxws;
 
 import javax.xml.transform.Source;
-import javax.xml.ws.Provider;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceProvider;
+import jakarta.xml.ws.Provider;
+import jakarta.xml.ws.ServiceMode;
+import jakarta.xml.ws.WebServiceProvider;
 
 @WebServiceProvider(targetNamespace = "http://camel.apache.org/cxf/jaxws/provider")
-@ServiceMode(value = javax.xml.ws.Service.Mode.PAYLOAD)
+@ServiceMode(value = jakarta.xml.ws.Service.Mode.PAYLOAD)
 public interface DefaultPayloadProviderSEI extends Provider<Source> {
     @Override
     Source invoke(Source request);
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultSEI.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultSEI.java
index afdb80e3b3c..0e1738d029c 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultSEI.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultSEI.java
@@ -16,12 +16,12 @@
  */
 package org.apache.camel.component.cxf.jaxws;
 
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
+import jakarta.jws.Oneway;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.jws.soap.SOAPBinding.ParameterStyle;
 
 /**
  * A Default Service Endpoint Interface (aka serviceClass) to be used if neither explicit serviceClass and WSDL is
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/WSDLServiceFactoryBean.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/WSDLServiceFactoryBean.java
index 81c8c6a837c..c4fd80dbd72 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/WSDLServiceFactoryBean.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/WSDLServiceFactoryBean.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import javax.wsdl.Definition;
 import javax.wsdl.Service;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Provider;
+import jakarta.xml.ws.Provider;
 
 import org.apache.camel.RuntimeCamelException;
 import org.apache.cxf.endpoint.Endpoint;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java
index 33807c19a57..0e6b3a16667 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.holder;
 
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.cxf.common.CXFTestSupport;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderEndpoint.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderEndpoint.java
index 88f4ed092cc..c822d8e765f 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderEndpoint.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderEndpoint.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.component.cxf.holder;
 
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Holder;
-import javax.xml.ws.RequestWrapper;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebService;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.RequestWrapper;
 
 @WebService
 @XmlSeeAlso({ MyOrderType.class })
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderType.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderType.java
index 653b8cfe1e0..50eb14d27aa 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderType.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderType.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.component.cxf.holder;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 public class MyOrderType {
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyProcessor.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyProcessor.java
index cab697f24c2..018e96c793a 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyProcessor.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyProcessor.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.holder;
 
 import java.util.List;
 
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java
index c2e4655acda..e9c016abd42 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.cxf.jaxws;
 import java.net.URL;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.Holder;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.cxf.common.CXFTestSupport;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringSoap12Test.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringSoap12Test.java
index 8f9b8d36761..3b876ab8cd3 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringSoap12Test.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringSoap12Test.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.jaxws;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.wsdl_first.PersonImpl12;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringTest.java
index da63f15cbfc..1daae3a5eb8 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.cxf.jaxws;
 import java.net.URL;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.Holder;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayLoadMarshalFaultTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayLoadMarshalFaultTest.java
index 34754b33eee..e83b1ea03c6 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayLoadMarshalFaultTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayLoadMarshalFaultTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.jaxws;
 
 import java.io.StringReader;
 
-import javax.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBContext;
 import javax.xml.namespace.QName;
 
 import org.w3c.dom.Element;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadFaultTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadFaultTest.java
index b65f67578c3..3903acc28fd 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadFaultTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadFaultTest.java
@@ -20,8 +20,8 @@ import java.io.StringReader;
 import java.net.URL;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.Holder;
 
 import org.w3c.dom.Element;
 
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerResponseTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerResponseTest.java
index 294310648a6..9e6410db8cd 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerResponseTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerResponseTest.java
@@ -20,7 +20,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerTest.java
index e3ad85b2b4d..e1dc999ed1e 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerTest.java
@@ -20,7 +20,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadBareSoapTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadBareSoapTest.java
index 732f00aefa2..dec9a492b84 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadBareSoapTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadBareSoapTest.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.cxf.jaxws;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.ws.Endpoint;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.AvailablePortFinder;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTest.java
index e721024fa09..56d7851f0e2 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTest.java
@@ -22,7 +22,7 @@ import java.util.List;
 import javax.xml.namespace.QName;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
-import javax.xml.ws.BindingProvider;
+import jakarta.xml.ws.BindingProvider;
 
 import org.w3c.dom.Element;
 
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTestAbstract.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTestAbstract.java
index 61fa96ae68e..9cea54eac56 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTestAbstract.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTestAbstract.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.jaxws;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.camel.component.cxf.common.CXFTestSupport;
 import org.apache.camel.test.junit5.CamelTestSupport;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerContextTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerContextTest.java
index 05064803d7c..3205c39b0c2 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerContextTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerContextTest.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.ws.BindingProvider;
+import jakarta.xml.ws.BindingProvider;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSoapFaultTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSoapFaultTest.java
index 0a7479fd4ac..f7629b6fc79 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSoapFaultTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSoapFaultTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.cxf.jaxws;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java
index 70e539a3bde..a7707519d60 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java
@@ -21,7 +21,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.w3c.dom.Document;
 
@@ -159,7 +159,7 @@ public class CxfProducerTest {
         Map<String, Object> responseContext = CastUtils.cast((Map<?, ?>) out.getHeader(Client.RESPONSE_CONTEXT));
         assertNotNull(responseContext);
         assertEquals("{http://apache.org/hello_world_soap_http}greetMe",
-                responseContext.get("javax.xml.ws.wsdl.operation").toString(), "Get the wrong wsdl operation name");
+                responseContext.get("jakarta.xml.ws.wsdl.operation").toString(), "Get the wrong wsdl operation name");
         assertEquals("Hello " + TEST_MESSAGE, result, "reply body on Camel");
 
         // check the other camel header copying
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfSchemaValidationTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfSchemaValidationTest.java
index 5a6650a2c96..cb3b6b471b9 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfSchemaValidationTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfSchemaValidationTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.cxf.jaxws;
 import java.net.URL;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Holder;
-import javax.xml.ws.soap.SOAPFaultException;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.soap.SOAPFaultException;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBindingTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBindingTest.java
index 5944512d1b9..8a74a2a22c8 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBindingTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBindingTest.java
@@ -25,8 +25,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
+import jakarta.activation.DataHandler;
+import jakarta.activation.FileDataSource;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoService.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoService.java
index ede951c5a45..e338f1b148a 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoService.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoService.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.jaxws;
 
-import javax.jws.WebService;
+import jakarta.jws.WebService;
 
 @WebService
 public interface EchoService {
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoServiceSessionImpl.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoServiceSessionImpl.java
index 10b82c05916..f649a7b059c 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoServiceSessionImpl.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoServiceSessionImpl.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.component.cxf.jaxws;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpSession;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.handler.MessageContext;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpSession;
+import jakarta.xml.ws.WebServiceContext;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.handler.MessageContext;
 
 public class EchoServiceSessionImpl implements EchoService {
 
@@ -31,7 +31,7 @@ public class EchoServiceSessionImpl implements EchoService {
     public String echo(String text) {
         // Find the HttpSession
         MessageContext mc = context.getMessageContext();
-        HttpSession session = ((javax.servlet.http.HttpServletRequest) mc.get(MessageContext.SERVLET_REQUEST)).getSession();
+        HttpSession session = ((jakarta.servlet.http.HttpServletRequest) mc.get(MessageContext.SERVLET_REQUEST)).getSession();
         if (session == null) {
             throw new WebServiceException("No HTTP Session found");
         }
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ParameterProcessor.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ParameterProcessor.java
index 9c367da45e3..915fdfe1c2e 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ParameterProcessor.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ParameterProcessor.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.jaxws;
 
 import java.util.List;
 
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.SOAPMessage;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ServiceProvider.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ServiceProvider.java
index 0e2ce5163cd..61834a514b5 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ServiceProvider.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ServiceProvider.java
@@ -17,10 +17,10 @@
 package org.apache.camel.component.cxf.jaxws;
 
 import javax.xml.transform.Source;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service.Mode;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceProvider;
+import jakarta.xml.ws.Provider;
+import jakarta.xml.ws.Service.Mode;
+import jakarta.xml.ws.ServiceMode;
+import jakarta.xml.ws.WebServiceProvider;
 
 @WebServiceProvider
 @ServiceMode(Mode.PAYLOAD)
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/SoapMessageProvider.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/SoapMessageProvider.java
index c867647f5b8..e4b679070be 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/SoapMessageProvider.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/SoapMessageProvider.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.component.cxf.jaxws;
 
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceProvider;
+import jakarta.xml.soap.SOAPMessage;
+import jakarta.xml.ws.Provider;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.ServiceMode;
+import jakarta.xml.ws.WebServiceProvider;
 
 @WebServiceProvider(portName = "SoapProviderPort", serviceName = "SOAPProviderService",
                     targetNamespace = "http://apache.org/hello_world_soap_http",
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/SoapTargetBean.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/SoapTargetBean.java
index 44c45ca0124..7d66ac24cbb 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/SoapTargetBean.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/SoapTargetBean.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.cxf.jaxws;
 import java.io.InputStream;
 
 import javax.xml.namespace.QName;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.MessageFactory;
+import jakarta.xml.soap.SOAPBody;
+import jakarta.xml.soap.SOAPMessage;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java
index a7004d69fd1..6953894eedd 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java
@@ -16,14 +16,14 @@
  */
 package org.apache.camel.component.cxf.multipart;
 
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
 
 import org.apache.camel.cxf.multipart.MultiPartInvoke;
 import org.apache.camel.cxf.multipart.types.InE;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@javax.jws.WebService(
+@jakarta.jws.WebService(
                       serviceName = "MultiPartInvokeService",
                       portName = "MultiPartInvokePort",
                       targetNamespace = "http://adapter.ti.tongtech.com/ws",
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/noparam/NoParamEndpoint.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/noparam/NoParamEndpoint.java
index 85e8699ad1f..2f86b54ba2f 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/noparam/NoParamEndpoint.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/noparam/NoParamEndpoint.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.component.cxf.noparam;
 
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
index e4558338d83..c69dd4d100f 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
@@ -19,14 +19,14 @@ package org.apache.camel.component.cxf.soap.headers;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.annotation.Resource;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
+import jakarta.annotation.Resource;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Holder;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.WebServiceContext;
+import jakarta.xml.ws.handler.MessageContext;
 
 import org.w3c.dom.Node;
 
@@ -37,7 +37,7 @@ import org.apache.cxf.outofband.header.OutofBandHeader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@javax.jws.WebService(serviceName = "HeaderService",
+@jakarta.jws.WebService(serviceName = "HeaderService",
                       targetNamespace = "http://apache.org/camel/cxf/soap/headers",
                       endpointInterface = "org.apache.camel.component.cxf.soap.headers.HeaderTester")
 
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java
index 41029ec3219..7857a278182 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java
@@ -18,10 +18,10 @@ package org.apache.camel.component.cxf.soap.headers;
 
 import java.util.List;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.ws.handler.MessageContext;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.ws.handler.MessageContext;
 
 import org.w3c.dom.Node;
 
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/wsdl/OrderEndpoint.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/wsdl/OrderEndpoint.java
index 1db7e00c05f..19587bcd6e0 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/wsdl/OrderEndpoint.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/wsdl/OrderEndpoint.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.component.cxf.wsdl;
 
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java
index 1950ec337bb..00663b28d68 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java
@@ -19,9 +19,9 @@ package org.apache.camel.wsdl_first;
 import java.util.Set;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.handler.soap.SOAPHandler;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
+import jakarta.xml.ws.handler.MessageContext;
+import jakarta.xml.ws.handler.soap.SOAPHandler;
+import jakarta.xml.ws.handler.soap.SOAPMessageContext;
 
 public class JaxwsTestHandler implements SOAPHandler<SOAPMessageContext> {
 
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl.java
index 96279efe816..2dd704fd02d 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.wsdl_first;
 
-import javax.jws.WebService;
-import javax.xml.ws.Holder;
+import jakarta.jws.WebService;
+import jakarta.xml.ws.Holder;
 
 @WebService(serviceName = "PersonService",
             targetNamespace = "http://camel.apache.org/wsdl-first",
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java
index 935ca20e222..cc4727cd6b3 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java
@@ -16,14 +16,14 @@
  */
 package org.apache.camel.wsdl_first;
 
-import javax.jws.WebService;
+import jakarta.jws.WebService;
 
 @WebService(serviceName = "PersonService12",
             targetNamespace = "http://camel.apache.org/wsdl-first",
             endpointInterface = "org.apache.camel.wsdl_first.Person",
             wsdlLocation = "classpath:/person.wsdl")
 
-@javax.xml.ws.BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/")
+@jakarta.xml.ws.BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/")
 public class PersonImpl12 extends PersonImpl {
 
 }
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImplWithWsdl.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImplWithWsdl.java
index a5f0c68578c..6daa59ecc0c 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImplWithWsdl.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonImplWithWsdl.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.wsdl_first;
 
-import javax.jws.WebService;
-import javax.xml.ws.Holder;
+import jakarta.jws.WebService;
+import jakarta.xml.ws.Holder;
 
 @WebService(serviceName = "PersonService",
             targetNamespace = "http://camel.apache.org/wsdl-first",
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonMultiPartImpl.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonMultiPartImpl.java
index c783dc6c92a..127f45a9660 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonMultiPartImpl.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonMultiPartImpl.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.wsdl_first;
 
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
 
 /**
  * Test Impl class for PersonMultiPartType port type that verifies multi part SOAP message functionality.
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
index 3a0cb840653..5783c627ab2 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.wsdl_first;
 
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java
index fa121a36c75..e9a2b427f91 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.component.cxf.jaxrs;
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
 
 import org.apache.camel.component.cxf.jaxrs.testbean.CustomException;
 
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsAsyncProducerTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsAsyncProducerTest.java
index 4c365185f43..90eb4fb2bc8 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsAsyncProducerTest.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsAsyncProducerTest.java
@@ -21,7 +21,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java
index be09745c4ea..6f1d58acb8b 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java
@@ -21,16 +21,16 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 
-import javax.servlet.ServletRequest;
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Request;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import jakarta.servlet.ServletRequest;
+import jakarta.ws.rs.HttpMethod;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Request;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.LoggingLevel;
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHeaderTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHeaderTest.java
index 006e7a1c1ff..ce4245e6ad4 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHeaderTest.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHeaderTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.jaxrs;
 
 import java.io.InputStream;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java
index 8eb25e6827f..c366f47dd41 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java
@@ -21,7 +21,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java
index 8df91cb1f2f..3e1fd441704 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding;
 
 import java.io.StringWriter;
 
-import javax.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBContext;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
index b30a619bf69..767019c9498 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
@@ -23,8 +23,8 @@ import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.activation.DataHandler;
-import javax.xml.bind.JAXBContext;
+import jakarta.activation.DataHandler;
+import jakarta.xml.bind.JAXBContext;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Customer.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Customer.java
index 3a2f12fe823..8f79c6a6775 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Customer.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Customer.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 import org.apache.camel.util.ObjectHelper;
 
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerList.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerList.java
index 10c86f96ad2..fbbd2d071f9 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerList.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerList.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
 
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "CustomerList")
 public class CustomerList {
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerService.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerService.java
index 5b5eb2b5983..83451610262 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerService.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerService.java
@@ -18,15 +18,15 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
 
 import java.io.InputStream;
 
-import javax.activation.DataHandler;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
+import jakarta.activation.DataHandler;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.camel.component.cxf.jaxrs.testbean.Customer;
 
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceImpl.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceImpl.java
index 5dc1e4f88a2..363f989ac8f 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceImpl.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceImpl.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
 
 import java.io.InputStream;
 
-import javax.activation.DataHandler;
-import javax.ws.rs.core.Response;
+import jakarta.activation.DataHandler;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.camel.component.cxf.jaxrs.testbean.Customer;
 
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceResource.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceResource.java
index 2a2d8563f6a..a7b2da9f58a 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceResource.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceResource.java
@@ -18,15 +18,15 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
 
 import java.io.InputStream;
 
-import javax.activation.DataHandler;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
+import jakarta.activation.DataHandler;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.camel.component.cxf.jaxrs.testbean.Customer;
 
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java
index f1c043f0eda..5b62e0d0312 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java
@@ -16,12 +16,12 @@
  */
 package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
 
-import javax.activation.DataHandler;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
+import jakarta.activation.DataHandler;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.cxf.jaxrs.ext.multipart.Multipart;
 
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java
index 9b427a5085a..1ab8c5af88c 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "Order")
 public class Order {
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Product.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Product.java
index 3731cefdb56..69bb31724f9 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Product.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Product.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "Product")
 public class Product {
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/VipCustomerResource.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/VipCustomerResource.java
index d7e02c90a49..b435e958fdb 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/VipCustomerResource.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/VipCustomerResource.java
@@ -16,13 +16,13 @@
  */
 package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
 
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
 
 public class VipCustomerResource {
 
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java
index e0b740c8761..f00deb6bb74 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.jaxrs.testbean;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 import org.apache.camel.util.ObjectHelper;
 
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
index c30fd82dd79..ae95e743fe7 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
@@ -22,15 +22,15 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.cxf.common.util.StringUtils;
 
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java
index e36313746a1..652fbe70ab8 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java
@@ -16,13 +16,13 @@
  */
 package org.apache.camel.component.cxf.jaxrs.testbean;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Response;
 
 // START SNIPPET: example
 @Path("/customerservice/")
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/EchoService.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/EchoService.java
index abba335cd10..5aac219f469 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/EchoService.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/EchoService.java
@@ -16,13 +16,13 @@
  */
 package org.apache.camel.component.cxf.jaxrs.testbean;
 
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Cookie;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.NewCookie;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Cookie;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.NewCookie;
+import jakarta.ws.rs.core.Response;
 
 @Path("/echoservice/")
 public class EchoService {
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
index 0ac90a8e5bc..4e67a93d787 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.cxf.jaxrs.testbean;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "Order")
 public class Order {
diff --git a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java
index d363af1055e..94f26b5256d 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java
+++ b/components/camel-cxf/camel-cxf-spring-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.jaxrs.testbean;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "Product")
 public class Product {
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpoint.java b/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpoint.java
index 0f2e2a6566b..af07bb88d9c 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpoint.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpoint.java
@@ -17,7 +17,7 @@
 package org.apache.camel.component.cxf.spring.jaxws;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.Provider;
+import jakarta.xml.ws.Provider;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.cxf.common.DataFormat;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpointUtils.java b/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpointUtils.java
index e1e97b406aa..5d4d41fa846 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpointUtils.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpointUtils.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.cxf.spring.jaxws;
 
 import java.lang.annotation.Annotation;
 
-import javax.jws.WebService;
+import jakarta.jws.WebService;
 import javax.xml.namespace.QName;
-import javax.xml.ws.WebServiceProvider;
+import jakarta.xml.ws.WebServiceProvider;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.CamelException;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java
index fa712227117..1b7e9fbfe8a 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java
@@ -17,7 +17,7 @@
 package org.apache.camel.component.cxf;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
+import jakarta.xml.ws.Service;
 
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.component.cxf.common.CXFTestSupport;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java
index 9d05802f3be..7f6aaee8f92 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java
@@ -21,9 +21,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Holder;
-import javax.xml.ws.WebServiceException;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.WebServiceException;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFGreeterEnrichTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFGreeterEnrichTest.java
index 5f5ba7a9298..3d1d2c17f5b 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFGreeterEnrichTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFGreeterEnrichTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.hello_world_soap_http.GreeterImpl;
 import org.junit.jupiter.api.AfterAll;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java
index ce42d974a27..16d20bc6bdd 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.hello_world_soap_http.GreeterImpl;
 import org.junit.jupiter.api.AfterAll;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java
index 391650e82d4..d3157c7da64 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.cxf;
 import java.net.URL;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.Holder;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.cxf.common.CXFTestSupport;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java
index cb61130e19d..ffbd25f865a 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java
@@ -20,10 +20,10 @@ import java.net.URL;
 import java.util.ResourceBundle;
 
 import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPFault;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Holder;
-import javax.xml.ws.soap.SOAPFaultException;
+import jakarta.xml.soap.SOAPFault;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.soap.SOAPFaultException;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchTestSupport.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchTestSupport.java
index d04354e5a93..8c63fb1ed34 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchTestSupport.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchTestSupport.java
@@ -17,7 +17,7 @@
 package org.apache.camel.component.cxf;
 
 import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterCXFMessageRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterCXFMessageRouterTest.java
index 484d3c08c16..129240dcf9b 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterCXFMessageRouterTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterCXFMessageRouterTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.hello_world_soap_http.GreeterImpl;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterCXFMessageWithoutSEIRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterCXFMessageWithoutSEIRouterTest.java
index 309e2872049..d808e103cb5 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterCXFMessageWithoutSEIRouterTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterCXFMessageWithoutSEIRouterTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.hello_world_soap_http.GreeterImpl;
 import org.junit.jupiter.api.AfterAll;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterConverterRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterConverterRouterTest.java
index 85f6eb555dd..697af08a694 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterConverterRouterTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterConverterRouterTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.hello_world_soap_http.GreeterImpl;
 import org.junit.jupiter.api.AfterAll;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageCamelHttpRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageCamelHttpRouterTest.java
index 84c37ba8bf8..c47318ec450 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageCamelHttpRouterTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageCamelHttpRouterTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.hello_world_soap_http.GreeterImpl;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageRouterTest.java
index 55a58c0efd4..540c3a9a6e7 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageRouterTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageRouterTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.hello_world_soap_http.GreeterImpl;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadRouterTest.java
index 9b4a862f1d5..72f4b8f75ec 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadRouterTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadRouterTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.hello_world_soap_http.GreeterImpl;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadWithFeatureRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadWithFeatureRouterTest.java
index 05187a4290e..f4683953ac2 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadWithFeatureRouterTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadWithFeatureRouterTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.camel.component.cxf.common.DataFormat;
 import org.apache.camel.component.cxf.jaxws.CxfEndpoint;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterWSDLOnlyRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterWSDLOnlyRouterTest.java
index 171e06fe042..ec4e68dd669 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterWSDLOnlyRouterTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfGreeterWSDLOnlyRouterTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.hello_world_soap_http.GreeterImpl;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfMessageHeaderTimeoutTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfMessageHeaderTimeoutTest.java
index 4d989806534..79c3addc563 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfMessageHeaderTimeoutTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfMessageHeaderTimeoutTest.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfNonWrapperTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfNonWrapperTest.java
index c26b41c7adf..1216cb4c580 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfNonWrapperTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfNonWrapperTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.cxf;
 import java.net.URL;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
+import jakarta.xml.ws.BindingProvider;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.cxf.common.CXFTestSupport;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java
index 453c4bc17b1..d840e53427c 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.cxf;
 import java.io.ByteArrayOutputStream;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
+import jakarta.xml.ws.Service;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderSpringTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderSpringTest.java
index 90c8cf76b07..24b64442945 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderSpringTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderSpringTest.java
@@ -22,8 +22,8 @@ import java.util.List;
 import javax.xml.namespace.QName;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.Endpoint;
 
 import org.w3c.dom.Element;
 
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderTestAbstract.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderTestAbstract.java
index 18b7018b74e..85e1d5d8702 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderTestAbstract.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderTestAbstract.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.camel.component.cxf.common.CXFTestSupport;
 import org.apache.camel.test.junit5.CamelTestSupport;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadProviderRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadProviderRouterTest.java
index 803097895bd..98b3134827e 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadProviderRouterTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadProviderRouterTest.java
@@ -17,8 +17,8 @@
 package org.apache.camel.component.cxf;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.Service;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.Service;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.cxf.interceptor.Fault;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java
index 430e6bf5fcb..7dae13bf30b 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.cxf;
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.cxf.common.CXFTestSupport;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadWsdlWithoutSEITest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadWsdlWithoutSEITest.java
index 75f979d524d..9913ac8c955 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadWsdlWithoutSEITest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadWsdlWithoutSEITest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java
index c6f297b86b2..614b825d8fa 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java
@@ -20,7 +20,7 @@ import java.lang.reflect.UndeclaredThrowableException;
 import java.net.URL;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
+import jakarta.xml.ws.BindingProvider;
 
 import org.apache.camel.component.cxf.common.CXFTestSupport;
 import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfTimeoutTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfTimeoutTest.java
index c87e38fca98..275df0092ce 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfTimeoutTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfTimeoutTest.java
@@ -20,7 +20,7 @@ import java.net.SocketTimeoutException;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstPayloadModeTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstPayloadModeTest.java
index db29e966bcf..6fa91fced38 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstPayloadModeTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstPayloadModeTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.camel.wsdl_first.JaxwsTestHandler;
 import org.apache.camel.wsdl_first.PersonImpl;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstProcessorTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstProcessorTest.java
index 158710fa8d4..b9d7b4cabdc 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstProcessorTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstProcessorTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.camel.wsdl_first.JaxwsTestHandler;
 import org.apache.camel.wsdl_first.PersonImpl;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
index dac31dbc3c5..412c45828fc 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.camel.wsdl_first.PersonImpl;
 import org.junit.jupiter.api.BeforeAll;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/EchoService.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/EchoService.java
index c76eaef46e1..2160744a1f0 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/EchoService.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/EchoService.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf;
 
-import javax.jws.WebService;
+import jakarta.jws.WebService;
 
 @WebService
 public interface EchoService {
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/EchoServiceSessionImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/EchoServiceSessionImpl.java
index d5a7c189d8d..df1709984b1 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/EchoServiceSessionImpl.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/EchoServiceSessionImpl.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.component.cxf;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpSession;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.handler.MessageContext;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpSession;
+import jakarta.xml.ws.WebServiceContext;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.handler.MessageContext;
 
 public class EchoServiceSessionImpl implements EchoService {
 
@@ -31,7 +31,7 @@ public class EchoServiceSessionImpl implements EchoService {
     public String echo(String text) {
         // Find the HttpSession
         MessageContext mc = context.getMessageContext();
-        HttpSession session = ((javax.servlet.http.HttpServletRequest) mc.get(MessageContext.SERVLET_REQUEST)).getSession();
+        HttpSession session = ((jakarta.servlet.http.HttpServletRequest) mc.get(MessageContext.SERVLET_REQUEST)).getSession();
         if (session == null) {
             throw new WebServiceException("No HTTP Session found");
         }
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/HelloImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/HelloImpl.java
index b0d8a217969..9bac211cec8 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/HelloImpl.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/HelloImpl.java
@@ -18,12 +18,12 @@ package org.apache.camel.component.cxf;
 
 import java.awt.*;
 
-import javax.xml.ws.BindingType;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.BindingType;
+import jakarta.xml.ws.Holder;
 
 import org.apache.camel.cxf.mtom_feature.Hello;
 
-@BindingType(value = javax.xml.ws.soap.SOAPBinding.SOAP11HTTP_MTOM_BINDING)
+@BindingType(value = jakarta.xml.ws.soap.SOAPBinding.SOAP11HTTP_MTOM_BINDING)
 public class HelloImpl implements Hello {
     public void detail(Holder<byte[]> photo, Holder<Image> image) {
         // echo through Holder
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ParameterProcessor.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ParameterProcessor.java
index 5d36cfbb872..46654474b96 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ParameterProcessor.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ParameterProcessor.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf;
 
 import java.util.List;
 
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.SOAPMessage;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ServiceProvider.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ServiceProvider.java
index 64b6adf04e3..9db3c60981c 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ServiceProvider.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ServiceProvider.java
@@ -17,10 +17,10 @@
 package org.apache.camel.component.cxf;
 
 import javax.xml.transform.Source;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service.Mode;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceProvider;
+import jakarta.xml.ws.Provider;
+import jakarta.xml.ws.Service.Mode;
+import jakarta.xml.ws.ServiceMode;
+import jakarta.xml.ws.WebServiceProvider;
 
 @WebServiceProvider
 @ServiceMode(Mode.PAYLOAD)
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/SoapMessageProvider.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/SoapMessageProvider.java
index 7e65cf42ad7..5b3b7af1ff5 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/SoapMessageProvider.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/SoapMessageProvider.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.component.cxf;
 
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceProvider;
+import jakarta.xml.soap.SOAPMessage;
+import jakarta.xml.ws.Provider;
+import jakarta.xml.ws.Service;
+import jakarta.xml.ws.ServiceMode;
+import jakarta.xml.ws.WebServiceProvider;
 
 @WebServiceProvider(portName = "SoapProviderPort", serviceName = "SOAPProviderService",
                     targetNamespace = "http://apache.org/hello_world_soap_http",
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/SoapTargetBean.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/SoapTargetBean.java
index 2d05605394b..21a21cd8f0f 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/SoapTargetBean.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/SoapTargetBean.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.cxf;
 import java.io.InputStream;
 
 import javax.xml.namespace.QName;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.MessageFactory;
+import jakarta.xml.soap.SOAPBody;
+import jakarta.xml.soap.SOAPMessage;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderEndpoint.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderEndpoint.java
index 88f4ed092cc..c822d8e765f 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderEndpoint.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderEndpoint.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.component.cxf.holder;
 
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Holder;
-import javax.xml.ws.RequestWrapper;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebService;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.RequestWrapper;
 
 @WebService
 @XmlSeeAlso({ MyOrderType.class })
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderType.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderType.java
index 653b8cfe1e0..50eb14d27aa 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderType.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderType.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.component.cxf.holder;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 public class MyOrderType {
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/holder/MyProcessor.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/holder/MyProcessor.java
index cab697f24c2..018e96c793a 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/holder/MyProcessor.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/holder/MyProcessor.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.holder;
 
 import java.util.List;
 
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java
index 05d17089ab9..67ebff084b0 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfJavaMtomProducerPayloadTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.cxf.mtom;
 import java.awt.*;
 import java.util.List;
 
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
index b23d14ea4de..d10ce45dba5 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
@@ -22,8 +22,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.activation.DataHandler;
-import javax.mail.util.ByteArrayDataSource;
+import jakarta.activation.DataHandler;
+import jakarta.mail.util.ByteArrayDataSource;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.xpath.XPathConstants;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
index b4d135c2018..2921c8ba6a2 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
@@ -22,9 +22,9 @@ import java.util.List;
 
 import javax.imageio.ImageIO;
 import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Holder;
-import javax.xml.ws.soap.SOAPBinding;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.soap.SOAPBinding;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java
index af9a2a0ab3a..19410ad12af 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java
@@ -20,8 +20,8 @@ import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.activation.DataHandler;
-import javax.mail.util.ByteArrayDataSource;
+import jakarta.activation.DataHandler;
+import jakarta.mail.util.ByteArrayDataSource;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
index e64cec70524..cf58612690c 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
@@ -25,16 +25,16 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import javax.activation.DataHandler;
-import javax.activation.DataSource;
-import javax.annotation.Resource;
+import jakarta.activation.DataHandler;
+import jakarta.activation.DataSource;
+import jakarta.annotation.Resource;
 import javax.imageio.ImageIO;
-import javax.mail.util.ByteArrayDataSource;
+import jakarta.mail.util.ByteArrayDataSource;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
-import javax.xml.ws.Holder;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.WebServiceContext;
+import jakarta.xml.ws.handler.MessageContext;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
index 18ee897773e..44c3c6893e3 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
@@ -20,9 +20,9 @@ import java.awt.*;
 import java.awt.image.BufferedImage;
 
 import javax.imageio.ImageIO;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.Holder;
-import javax.xml.ws.soap.SOAPBinding;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.soap.SOAPBinding;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
index 92d2c122723..103fefa861f 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
@@ -24,13 +24,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
 import javax.imageio.ImageIO;
-import javax.mail.util.ByteArrayDataSource;
+import jakarta.mail.util.ByteArrayDataSource;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.soap.SOAPBinding;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.soap.SOAPBinding;
 import javax.xml.xpath.XPathConstants;
 
 import org.w3c.dom.Element;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterCxfMessageModeTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterCxfMessageModeTest.java
index 895a9e5d9c8..8a7088d64eb 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterCxfMessageModeTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterCxfMessageModeTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.mtom;
 
 import java.net.URL;
 
-import javax.xml.ws.BindingProvider;
+import jakarta.xml.ws.BindingProvider;
 
 import org.apache.camel.cxf.mtom_feature.Hello;
 import org.apache.camel.cxf.mtom_feature.HelloService;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadMode12Test.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadMode12Test.java
index 17aec6df612..dfc067f524d 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadMode12Test.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadMode12Test.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.mtom;
 
 import java.net.URL;
 
-import javax.xml.ws.BindingProvider;
+import jakarta.xml.ws.BindingProvider;
 
 import org.apache.camel.cxf.mtom_feature.Hello;
 import org.apache.camel.cxf.mtom_feature.HelloService12;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java
index a00d2a92fa1..5079164410b 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java
@@ -21,10 +21,10 @@ import java.awt.image.BufferedImage;
 import java.net.URL;
 
 import javax.imageio.ImageIO;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.Holder;
-import javax.xml.ws.soap.SOAPBinding;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.soap.SOAPBinding;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.cxf.common.CXFTestSupport;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterRawModeTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterRawModeTest.java
index 3f70e819b24..aea512d677f 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterRawModeTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterRawModeTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.mtom;
 
 import java.net.URL;
 
-import javax.xml.ws.BindingProvider;
+import jakarta.xml.ws.BindingProvider;
 
 import org.apache.camel.cxf.mtom_feature.Hello;
 import org.apache.camel.cxf.mtom_feature.HelloService;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl.java
index 010408748a6..071c9266d67 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl.java
@@ -21,7 +21,7 @@ import java.awt.image.BufferedImage;
 import java.io.IOException;
 
 import javax.imageio.ImageIO;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
 
 import org.apache.camel.cxf.mtom_feature.Hello;
 
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl12.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl12.java
index e445baa33bf..9ecefda31c3 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl12.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl12.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.component.cxf.mtom;
 
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
+import jakarta.jws.WebService;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
 
 import org.apache.camel.cxf.mtom_feature.Hello;
 
@@ -28,7 +28,7 @@ import org.apache.camel.cxf.mtom_feature.Hello;
 @WebService(serviceName = "HelloService12")
 @XmlSeeAlso({ org.apache.camel.cxf.mtom_feature.types.ObjectFactory.class })
 
-@javax.xml.ws.BindingType(value = javax.xml.ws.soap.SOAPBinding.SOAP12HTTP_MTOM_BINDING)
+@jakarta.xml.ws.BindingType(value = jakarta.xml.ws.soap.SOAPBinding.SOAP12HTTP_MTOM_BINDING)
 public class HelloImpl12 extends HelloImpl implements Hello {
 
 }
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java
index 52a62d82484..9b310f2222b 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java
@@ -17,8 +17,8 @@
 package org.apache.camel.component.cxf.multipart;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.Service;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.Service;
 
 import org.apache.camel.component.cxf.common.CXFTestSupport;
 import org.apache.camel.cxf.multipart.MultiPartInvoke;
@@ -83,8 +83,8 @@ public class CXFMultiPartTest extends CamelSpringTestSupport {
         e0.setV(in0);
         e1.setV(in1);
 
-        javax.xml.ws.Holder<InE> h = new javax.xml.ws.Holder<>();
-        javax.xml.ws.Holder<InE> h1 = new javax.xml.ws.Holder<>();
+        jakarta.xml.ws.Holder<InE> h = new jakarta.xml.ws.Holder<>();
+        jakarta.xml.ws.Holder<InE> h1 = new jakarta.xml.ws.Holder<>();
         multiPartClient.foo(e0, e1, h, h1);
         return h.value.getV() + " " + h1.value.getV();
     }
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java
index a7004d69fd1..6953894eedd 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java
@@ -16,14 +16,14 @@
  */
 package org.apache.camel.component.cxf.multipart;
 
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
 
 import org.apache.camel.cxf.multipart.MultiPartInvoke;
 import org.apache.camel.cxf.multipart.types.InE;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@javax.jws.WebService(
+@jakarta.jws.WebService(
                       serviceName = "MultiPartInvokeService",
                       portName = "MultiPartInvokePort",
                       targetNamespace = "http://adapter.ti.tongtech.com/ws",
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/noparam/NoParamEndpoint.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/noparam/NoParamEndpoint.java
index 85e8699ad1f..2f86b54ba2f 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/noparam/NoParamEndpoint.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/noparam/NoParamEndpoint.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.component.cxf.noparam;
 
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
index 6b333e7089c..dc91560601e 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
@@ -24,15 +24,15 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
 import javax.xml.namespace.QName;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.Holder;
 
 import org.w3c.dom.Node;
 
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
index e4558338d83..c69dd4d100f 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
@@ -19,14 +19,14 @@ package org.apache.camel.component.cxf.soap.headers;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.annotation.Resource;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
+import jakarta.annotation.Resource;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Holder;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.WebServiceContext;
+import jakarta.xml.ws.handler.MessageContext;
 
 import org.w3c.dom.Node;
 
@@ -37,7 +37,7 @@ import org.apache.cxf.outofband.header.OutofBandHeader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@javax.jws.WebService(serviceName = "HeaderService",
+@jakarta.jws.WebService(serviceName = "HeaderService",
                       targetNamespace = "http://apache.org/camel/cxf/soap/headers",
                       endpointInterface = "org.apache.camel.component.cxf.soap.headers.HeaderTester")
 
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java
index 41029ec3219..7857a278182 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java
@@ -18,10 +18,10 @@ package org.apache.camel.component.cxf.soap.headers;
 
 import java.util.List;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.ws.handler.MessageContext;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.ws.handler.MessageContext;
 
 import org.w3c.dom.Node;
 
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wsdl/OrderEndpoint.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wsdl/OrderEndpoint.java
index 1db7e00c05f..19587bcd6e0 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wsdl/OrderEndpoint.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wsdl/OrderEndpoint.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.component.cxf.wsdl;
 
-import javax.jws.WebMethod;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebService;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wsrm/HelloWorld.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wsrm/HelloWorld.java
index 233895c1a27..985b3b86d77 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wsrm/HelloWorld.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wsrm/HelloWorld.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.wsrm;
 
-import javax.jws.WebService;
+import jakarta.jws.WebService;
 
 @WebService(targetNamespace = "http://camel.apache.org/cxf/wsrm")
 public interface HelloWorld {
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/WSSecurityRouteTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/WSSecurityRouteTest.java
index 2436ad2da50..f18296f3d0a 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/WSSecurityRouteTest.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/camel/WSSecurityRouteTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.wssecurity.camel;
 
 import java.net.URL;
 
-import javax.xml.ws.BindingProvider;
+import jakarta.xml.ws.BindingProvider;
 
 import org.apache.camel.component.cxf.common.CXFTestSupport;
 import org.apache.camel.component.cxf.wssecurity.server.CxfServer;
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/server/GreeterImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/server/GreeterImpl.java
index 67262f3ff4d..078c1ed2c46 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/server/GreeterImpl.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/server/GreeterImpl.java
@@ -20,7 +20,7 @@ import java.util.logging.Logger;
 
 import org.apache.camel.hello_world_soap_http.Greeter;
 
-@javax.jws.WebService(serviceName = "GreeterService",
+@jakarta.jws.WebService(serviceName = "GreeterService",
                       portName = "GreeterPort",
                       endpointInterface = "org.apache.camel.hello_world_soap_http.Greeter",
                       targetNamespace = "http://camel.apache.org/hello_world_soap_http")
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java
index 1950ec337bb..00663b28d68 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java
@@ -19,9 +19,9 @@ package org.apache.camel.wsdl_first;
 import java.util.Set;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.handler.soap.SOAPHandler;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
+import jakarta.xml.ws.handler.MessageContext;
+import jakarta.xml.ws.handler.soap.SOAPHandler;
+import jakarta.xml.ws.handler.soap.SOAPMessageContext;
 
 public class JaxwsTestHandler implements SOAPHandler<SOAPMessageContext> {
 
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl.java
index 96279efe816..2dd704fd02d 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.wsdl_first;
 
-import javax.jws.WebService;
-import javax.xml.ws.Holder;
+import jakarta.jws.WebService;
+import jakarta.xml.ws.Holder;
 
 @WebService(serviceName = "PersonService",
             targetNamespace = "http://camel.apache.org/wsdl-first",
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java
index 935ca20e222..cc4727cd6b3 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImpl12.java
@@ -16,14 +16,14 @@
  */
 package org.apache.camel.wsdl_first;
 
-import javax.jws.WebService;
+import jakarta.jws.WebService;
 
 @WebService(serviceName = "PersonService12",
             targetNamespace = "http://camel.apache.org/wsdl-first",
             endpointInterface = "org.apache.camel.wsdl_first.Person",
             wsdlLocation = "classpath:/person.wsdl")
 
-@javax.xml.ws.BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/")
+@jakarta.xml.ws.BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/")
 public class PersonImpl12 extends PersonImpl {
 
 }
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImplWithWsdl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImplWithWsdl.java
index a5f0c68578c..6daa59ecc0c 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImplWithWsdl.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonImplWithWsdl.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.wsdl_first;
 
-import javax.jws.WebService;
-import javax.xml.ws.Holder;
+import jakarta.jws.WebService;
+import jakarta.xml.ws.Holder;
 
 @WebService(serviceName = "PersonService",
             targetNamespace = "http://camel.apache.org/wsdl-first",
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonMultiPartImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonMultiPartImpl.java
index c783dc6c92a..127f45a9660 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonMultiPartImpl.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonMultiPartImpl.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.wsdl_first;
 
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
 
 /**
  * Test Impl class for PersonMultiPartType port type that verifies multi part SOAP message functionality.
diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
index 3a0cb840653..5783c627ab2 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
+++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.wsdl_first;
 
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java
index fc009501a70..e63bdaa5598 100644
--- a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java
+++ b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java
@@ -20,7 +20,7 @@ import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.Collections;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.component.cxf.transport.CamelTransportConstants;
diff --git a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
index 8a2dd3f0651..fb8e05845e7 100644
--- a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
+++ b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
@@ -20,9 +20,9 @@ import java.io.IOException;
 import java.io.InputStream;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.Holder;
-import javax.xml.ws.WebServiceException;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.WebServiceException;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.NoSuchEndpointException;
diff --git a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelDestinationTest.java b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelDestinationTest.java
index 0ac28932324..a3ba552bf2d 100644
--- a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelDestinationTest.java
+++ b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelDestinationTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.transport;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java
index 9172d042fca..ea75082ccd3 100644
--- a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java
+++ b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java
@@ -18,15 +18,15 @@ package org.apache.camel.component.cxf.transport;
 
 import java.util.concurrent.Future;
 
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
 import javax.xml.namespace.QName;
-import javax.xml.ws.AsyncHandler;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.Response;
-import javax.xml.ws.Service;
+import jakarta.xml.ws.AsyncHandler;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.Response;
+import jakarta.xml.ws.Service;
 
 import org.apache.camel.test.junit5.CamelTestSupport;
 import org.apache.cxf.Bus;
diff --git a/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/message/DefaultCxfMessageMapper.java b/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/message/DefaultCxfMessageMapper.java
index 0c5373cf9be..c2ac2a38401 100644
--- a/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/message/DefaultCxfMessageMapper.java
+++ b/components/camel-cxf/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/message/DefaultCxfMessageMapper.java
@@ -20,7 +20,7 @@ import java.security.Principal;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.spi.HeaderFilterStrategy;
diff --git a/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java b/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java
index fc009501a70..e63bdaa5598 100644
--- a/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java
+++ b/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/DefaultCxfMessageMapperTest.java
@@ -20,7 +20,7 @@ import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.Collections;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.component.cxf.transport.CamelTransportConstants;
diff --git a/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelDestinationTest.java b/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelDestinationTest.java
index 0ac28932324..a3ba552bf2d 100644
--- a/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelDestinationTest.java
+++ b/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelDestinationTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.transport;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java b/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java
index 9172d042fca..ea75082ccd3 100644
--- a/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java
+++ b/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java
@@ -18,15 +18,15 @@ package org.apache.camel.component.cxf.transport;
 
 import java.util.concurrent.Future;
 
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebResult;
+import jakarta.jws.WebService;
 import javax.xml.namespace.QName;
-import javax.xml.ws.AsyncHandler;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.Response;
-import javax.xml.ws.Service;
+import jakarta.xml.ws.AsyncHandler;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.Response;
+import jakarta.xml.ws.Service;
 
 import org.apache.camel.test.junit5.CamelTestSupport;
 import org.apache.cxf.Bus;
diff --git a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/MapperFactory.java b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/MapperFactory.java
index 16c02ebdbb1..20fa5382ebd 100644
--- a/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/MapperFactory.java
+++ b/components/camel-dozer/src/main/java/org/apache/camel/converter/dozer/MapperFactory.java
@@ -90,7 +90,7 @@ public class MapperFactory {
                 answer = new DefaultELEngine(ELExpressionFactory.newInstance());
             }
         } else {
-            LOG.warn("Expressions are not supported by Dozer. Are you missing javax.el dependency?");
+            LOG.warn("Expressions are not supported by Dozer. Are you missing jakarta.el dependency?");
 
             answer = new NoopELEngine();
         }
diff --git a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/abc/ABCOrder.java b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/abc/ABCOrder.java
index 1c4d8cdf41e..5c49db0410a 100644
--- a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/abc/ABCOrder.java
+++ b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/abc/ABCOrder.java
@@ -19,12 +19,12 @@ package org.apache.camel.component.dozer.example.abc;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * <p>
diff --git a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/abc/ObjectFactory.java b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/abc/ObjectFactory.java
index 6ac08931fb8..d7ef90af9b6 100644
--- a/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/abc/ObjectFactory.java
+++ b/components/camel-dozer/src/test/java/org/apache/camel/component/dozer/example/abc/ObjectFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.dozer.example.abc;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 /**
  * This object contains factory methods for each Java content interface and Java element interface generated in the
diff --git a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerAttachmentsTest.java b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerAttachmentsTest.java
index 960265b7c72..3b01d905f57 100644
--- a/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerAttachmentsTest.java
+++ b/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerAttachmentsTest.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.component.freemarker;
 
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
+import jakarta.activation.DataHandler;
+import jakarta.activation.FileDataSource;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIT.java b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIT.java
index a394907c921..54d6f497ae5 100644
--- a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIT.java
+++ b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersMessagesIT.java
@@ -23,9 +23,9 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Session;
+import jakarta.mail.internet.MimeMessage;
 
 import com.google.api.services.gmail.model.ListMessagesResponse;
 import com.google.api.services.gmail.model.Message;
@@ -141,7 +141,7 @@ public class GmailUsersMessagesIT extends AbstractGoogleMailTestSupport {
         Properties props = new Properties();
         Session session = Session.getDefaultInstance(props, null);
         MimeMessage mm = new MimeMessage(session);
-        mm.addRecipients(javax.mail.Message.RecipientType.TO, profile.getEmailAddress());
+        mm.addRecipients(jakarta.mail.Message.RecipientType.TO, profile.getEmailAddress());
         mm.setSubject("Hello from camel-google-mail");
         mm.setContent("Camel rocks!", "text/plain");
         Message createMessageWithEmail = createMessageWithEmail(mm);
diff --git a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIT.java b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIT.java
index a5ae18031bf..cb3fb6eb31b 100644
--- a/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIT.java
+++ b/components/camel-google/camel-google-mail/src/test/java/org/apache/camel/component/google/mail/GmailUsersThreadsIT.java
@@ -22,9 +22,9 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.internet.MimeMessage;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Session;
+import jakarta.mail.internet.MimeMessage;
 
 import com.google.api.services.gmail.model.Message;
 import org.apache.camel.builder.RouteBuilder;
@@ -56,7 +56,7 @@ public class GmailUsersThreadsIT extends AbstractGoogleMailTestSupport {
         Properties props = new Properties();
         Session session = Session.getDefaultInstance(props, null);
         MimeMessage mm = new MimeMessage(session);
-        mm.addRecipients(javax.mail.Message.RecipientType.TO, profile.getEmailAddress());
+        mm.addRecipients(jakarta.mail.Message.RecipientType.TO, profile.getEmailAddress());
         mm.setSubject("Hello from camel-google-mail");
         mm.setContent("Camel rocks!", "text/plain");
         Message createMessageWithEmail = createMessageWithEmail(mm);
diff --git a/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/server/GoogleSheetsApiTestServer.java b/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/server/GoogleSheetsApiTestServer.java
index 81eaf5cd825..a49a43d7e92 100644
--- a/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/server/GoogleSheetsApiTestServer.java
+++ b/components/camel-google/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/server/GoogleSheetsApiTestServer.java
@@ -26,15 +26,15 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.zip.GZIPInputStream;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ReadListener;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
 
 import com.consol.citrus.Citrus;
 import com.consol.citrus.dsl.runner.DefaultTestRunner;
diff --git a/components/camel-http-common/src/generated/java/org/apache/camel/http/common/HttpConverterLoader.java b/components/camel-http-common/src/generated/java/org/apache/camel/http/common/HttpConverterLoader.java
index bcacebd1a75..2a6785a702b 100644
--- a/components/camel-http-common/src/generated/java/org/apache/camel/http/common/HttpConverterLoader.java
+++ b/components/camel-http-common/src/generated/java/org/apache/camel/http/common/HttpConverterLoader.java
@@ -43,15 +43,15 @@ public final class HttpConverterLoader implements TypeConverterLoader, CamelCont
     private void registerConverters(TypeConverterRegistry registry) {
         addTypeConverter(registry, java.io.BufferedReader.class, org.apache.camel.http.common.HttpMessage.class, false,
             (type, exchange, value) -> org.apache.camel.http.common.HttpConverter.toReader((org.apache.camel.http.common.HttpMessage) value));
-        addTypeConverter(registry, java.io.InputStream.class, javax.servlet.http.HttpServletRequest.class, false,
-            (type, exchange, value) -> org.apache.camel.http.common.HttpConverter.toInputStream((javax.servlet.http.HttpServletRequest) value, exchange));
+        addTypeConverter(registry, java.io.InputStream.class, jakarta.servlet.http.HttpServletRequest.class, false,
+            (type, exchange, value) -> org.apache.camel.http.common.HttpConverter.toInputStream((jakarta.servlet.http.HttpServletRequest) value, exchange));
         addTypeConverter(registry, java.io.InputStream.class, org.apache.camel.http.common.HttpMessage.class, false,
             (type, exchange, value) -> org.apache.camel.http.common.HttpConverter.toInputStream((org.apache.camel.http.common.HttpMessage) value, exchange));
-        addTypeConverter(registry, javax.servlet.ServletInputStream.class, org.apache.camel.http.common.HttpMessage.class, false,
+        addTypeConverter(registry, jakarta.servlet.ServletInputStream.class, org.apache.camel.http.common.HttpMessage.class, false,
             (type, exchange, value) -> org.apache.camel.http.common.HttpConverter.toServletInputStream((org.apache.camel.http.common.HttpMessage) value));
-        addTypeConverter(registry, javax.servlet.http.HttpServletRequest.class, org.apache.camel.Message.class, false,
+        addTypeConverter(registry, jakarta.servlet.http.HttpServletRequest.class, org.apache.camel.Message.class, false,
             (type, exchange, value) -> org.apache.camel.http.common.HttpConverter.toServletRequest((org.apache.camel.Message) value));
-        addTypeConverter(registry, javax.servlet.http.HttpServletResponse.class, org.apache.camel.Message.class, false,
+        addTypeConverter(registry, jakarta.servlet.http.HttpServletResponse.class, org.apache.camel.Message.class, false,
             (type, exchange, value) -> org.apache.camel.http.common.HttpConverter.toServletResponse((org.apache.camel.Message) value));
     }
 
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/CamelServlet.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/CamelServlet.java
index e9fdb717a83..1b2239ad5b3 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/CamelServlet.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/CamelServlet.java
@@ -28,12 +28,12 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.stream.Collectors;
 
-import javax.servlet.AsyncContext;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.camel.AsyncProcessor;
 import org.apache.camel.CamelContext;
@@ -390,7 +390,7 @@ public class CamelServlet extends HttpServlet implements HttpRegistryProvider {
 
     /**
      * @deprecated use
-     *             {@link ServletResolveConsumerStrategy#resolve(javax.servlet.http.HttpServletRequest, java.util.Map)}
+     *             {@link ServletResolveConsumerStrategy#resolve(jakarta.servlet.http.HttpServletRequest, java.util.Map)}
      */
     @Deprecated
     protected HttpConsumer resolve(HttpServletRequest request) {
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
index 4d0033c5ae2..6b559b58200 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpBinding.java
@@ -35,10 +35,10 @@ import java.util.TimeZone;
 import java.util.concurrent.TimeoutException;
 import java.util.zip.GZIPOutputStream;
 
-import javax.activation.DataHandler;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.activation.DataHandler;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpRegistry.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpRegistry.java
index d8761440cb7..73958f8034e 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpRegistry.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/DefaultHttpRegistry.java
@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.Servlet;
+import jakarta.servlet.Servlet;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpBinding.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpBinding.java
index 47e71359ead..51b51c87e65 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpBinding.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpBinding.java
@@ -18,8 +18,8 @@ package org.apache.camel.http.common;
 
 import java.io.IOException;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
@@ -106,9 +106,9 @@ public interface HttpBinding {
     boolean isUseReaderForPayload();
 
     /**
-     * Should the {@link javax.servlet.http.HttpServletRequest#getReader()} be exposed as the payload of input messages
+     * Should the {@link jakarta.servlet.http.HttpServletRequest#getReader()} be exposed as the payload of input messages
      * in the Camel {@link org.apache.camel.Message#getBody()} or not. If false then the
-     * {@link javax.servlet.http.HttpServletRequest#getInputStream()} will be exposed.
+     * {@link jakarta.servlet.http.HttpServletRequest#getInputStream()} will be exposed.
      * <p/>
      * Is default <tt>false</tt>.
      *
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java
index 506ef8d288e..c69c7dbd34e 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java
@@ -100,7 +100,7 @@ public abstract class HttpCommonEndpoint extends DefaultEndpoint implements Head
               description = "Used to only allow consuming if the HttpMethod matches, such as GET/POST/PUT etc. Multiple methods can be specified separated by comma.")
     String httpMethodRestrict;
     @UriParam(label = "consumer",
-              description = "To use a custom buffer size on the javax.servlet.ServletResponse.")
+              description = "To use a custom buffer size on the jakarta.servlet.ServletResponse.")
     Integer responseBufferSize;
     @UriParam(label = "producer",
               description = "If this option is true, The http producer won't read response body and cache the input stream")
@@ -459,7 +459,7 @@ public abstract class HttpCommonEndpoint extends DefaultEndpoint implements Head
     }
 
     /**
-     * To use a custom buffer size on the javax.servlet.ServletResponse.
+     * To use a custom buffer size on the jakarta.servlet.ServletResponse.
      */
     public void setResponseBufferSize(Integer responseBufferSize) {
         this.responseBufferSize = responseBufferSize;
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpConverter.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpConverter.java
index 3d136083eab..29e27a5e8d0 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpConverter.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpConverter.java
@@ -20,9 +20,9 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.camel.Converter;
 import org.apache.camel.Exchange;
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
index 21be3c16835..ef7fcf1565b 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
@@ -27,8 +27,8 @@ import java.net.URISyntaxException;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpMessage.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpMessage.java
index f0a21bada8b..9fd3abb84e1 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpMessage.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpMessage.java
@@ -18,8 +18,8 @@ package org.apache.camel.http.common;
 
 import java.io.IOException;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.RuntimeCamelException;
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpRestServletResolveConsumerStrategy.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpRestServletResolveConsumerStrategy.java
index 9b2f11cc7db..d7bb7abc359 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpRestServletResolveConsumerStrategy.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpRestServletResolveConsumerStrategy.java
@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.camel.support.RestConsumerContextPathMatcher;
 
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpServletResolveConsumerStrategy.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpServletResolveConsumerStrategy.java
index 07c7ee032cc..67d3b61825e 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpServletResolveConsumerStrategy.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpServletResolveConsumerStrategy.java
@@ -22,7 +22,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.camel.support.RestConsumerContextPathMatcher;
 
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/ServletResolveConsumerStrategy.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/ServletResolveConsumerStrategy.java
index 587863085d2..7bdf565b787 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/ServletResolveConsumerStrategy.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/ServletResolveConsumerStrategy.java
@@ -18,10 +18,10 @@ package org.apache.camel.http.common;
 
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
- * Strategy to resolve which consumer to service an incoming {@link javax.servlet.http.HttpServletRequest}.
+ * Strategy to resolve which consumer to service an incoming {@link jakarta.servlet.http.HttpServletRequest}.
  */
 public interface ServletResolveConsumerStrategy {
 
@@ -31,7 +31,7 @@ public interface ServletResolveConsumerStrategy {
      * @param  request   the http request
      * @param  consumers the map of registered consumers
      * @return           the consumer to service the request, or <tt>null</tt> if no match, which sends back a
-     *                   {@link javax.servlet.http.HttpServletResponse#SC_NOT_FOUND} to the client.
+     *                   {@link jakarta.servlet.http.HttpServletResponse#SC_NOT_FOUND} to the client.
      */
     HttpConsumer resolve(HttpServletRequest request, Map<String, HttpConsumer> consumers);
 
@@ -42,7 +42,7 @@ public interface ServletResolveConsumerStrategy {
      * @param  method    the http method
      * @param  consumers the map of registered consumers
      * @return           <tt>true</tt> if the method is allowed and can be serviced. Otherwise a
-     *                   {@link javax.servlet.http.HttpServletResponse#SC_METHOD_NOT_ALLOWED} is returned to the client.
+     *                   {@link jakarta.servlet.http.HttpServletResponse#SC_METHOD_NOT_ALLOWED} is returned to the client.
      */
     boolean isHttpMethodAllowed(HttpServletRequest request, String method, Map<String, HttpConsumer> consumers);
 
diff --git a/components/camel-http/src/test/java/org/apache/camel/component/http/handler/SessionReflectionHandler.java b/components/camel-http/src/test/java/org/apache/camel/component/http/handler/SessionReflectionHandler.java
index 5e64874fa0d..05d35b92ac3 100644
--- a/components/camel-http/src/test/java/org/apache/camel/component/http/handler/SessionReflectionHandler.java
+++ b/components/camel-http/src/test/java/org/apache/camel/component/http/handler/SessionReflectionHandler.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.http.handler;
 import java.io.IOException;
 import java.io.OutputStream;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 
 import org.apache.camel.util.IOHelper;
 import org.eclipse.jetty.server.Request;
diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/TestJAXBPojo.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/TestJAXBPojo.java
index 8b9827d45c2..6c62eec1cc1 100644
--- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/TestJAXBPojo.java
+++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/TestJAXBPojo.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.component.jackson;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "XMLPojo")
 public class TestJAXBPojo {
diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/Order.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/Order.java
index 3cdcee7db4a..ef314405e46 100644
--- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/Order.java
+++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/converter/Order.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.component.jackson.converter;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "order")
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/TestJAXBPojo.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/TestJAXBPojo.java
index e933186e8a4..9ae33286e5a 100644
--- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/TestJAXBPojo.java
+++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/TestJAXBPojo.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.component.jacksonxml;
 
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "XMLPojo")
 public class TestJAXBPojo {
diff --git a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
index 6cba113b505..26e2a534328 100644
--- a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
+++ b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
@@ -29,12 +29,12 @@ import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import javax.xml.stream.FactoryConfigurationError;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
diff --git a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
index 865d882cbcc..21094c6fb49 100644
--- a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
+++ b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
@@ -31,15 +31,15 @@ import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
 import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.JAXBIntrospector;
-import javax.xml.bind.MarshalException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.ValidationEvent;
-import javax.xml.bind.ValidationEventHandler;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBIntrospector;
+import jakarta.xml.bind.MarshalException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.ValidationEvent;
+import jakarta.xml.bind.ValidationEventHandler;
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
diff --git a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbHelper.java b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbHelper.java
index d096d722b3b..bd42e11358e 100644
--- a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbHelper.java
+++ b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbHelper.java
@@ -18,7 +18,7 @@ package org.apache.camel.converter.jaxb;
 
 import java.lang.reflect.Method;
 
-import javax.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlElementDecl;
 
 import org.apache.camel.CamelContext;
 
diff --git a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbNamespacePrefixMapper.java b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbNamespacePrefixMapper.java
index 3e799c12f60..6c30762827f 100644
--- a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbNamespacePrefixMapper.java
+++ b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbNamespacePrefixMapper.java
@@ -24,7 +24,7 @@ import java.util.Map;
 public interface JaxbNamespacePrefixMapper {
 
     /**
-     * JAXB requires the mapper to be registered as a property on the {@link javax.xml.bind.JAXBContext}.
+     * JAXB requires the mapper to be registered as a property on the {@link jakarta.xml.bind.JAXBContext}.
      */
     String getRegistrationKey();
 
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java
index fcb7409ec0a..3b1a65758ce 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatMultipleNamespacesTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.converter.jaxb;
 
-import javax.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBContext;
 
 import org.apache.camel.EndpointInject;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java
index c5001eac508..35c046345ce 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationSpringTest.java
@@ -20,8 +20,8 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.StringReader;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
 
 import org.xml.sax.InputSource;
 
@@ -103,7 +103,7 @@ public class JaxbDataFormatSchemaValidationSpringTest extends CamelSpringTestSup
 
         Throwable cause = ex.getCause();
         assertIsInstanceOf(IOException.class, cause);
-        assertTrue(cause.getMessage().contains("javax.xml.bind.MarshalException"));
+        assertTrue(cause.getMessage().contains("jakarta.xml.bind.MarshalException"));
         assertTrue(cause.getMessage().contains("org.xml.sax.SAXParseException"));
         assertTrue(cause.getMessage().contains("cvc-complex-type.2.4.a"));
     }
@@ -144,7 +144,7 @@ public class JaxbDataFormatSchemaValidationSpringTest extends CamelSpringTestSup
 
         Throwable cause = ex.getCause();
         assertIsInstanceOf(IOException.class, cause);
-        assertTrue(cause.getMessage().contains("javax.xml.bind.UnmarshalException"));
+        assertTrue(cause.getMessage().contains("jakarta.xml.bind.UnmarshalException"));
         assertTrue(cause.getMessage().contains("org.xml.sax.SAXParseException"));
         assertTrue(cause.getMessage().contains("cvc-complex-type.2.4.b"));
     }
@@ -157,7 +157,7 @@ public class JaxbDataFormatSchemaValidationSpringTest extends CamelSpringTestSup
 
         Throwable cause = ex.getCause();
         assertIsInstanceOf(IOException.class, cause);
-        assertTrue(cause.getMessage().contains("javax.xml.bind.MarshalException"));
+        assertTrue(cause.getMessage().contains("jakarta.xml.bind.MarshalException"));
         assertTrue(cause.getMessage().contains("org.xml.sax.SAXParseException"));
         assertTrue(cause.getMessage().contains("cvc-complex-type.2.4.b"));
     }
@@ -177,7 +177,7 @@ public class JaxbDataFormatSchemaValidationSpringTest extends CamelSpringTestSup
 
         Throwable cause = ex.getCause();
         assertIsInstanceOf(IOException.class, cause);
-        assertTrue(cause.getMessage().contains("javax.xml.bind.UnmarshalException"));
+        assertTrue(cause.getMessage().contains("jakarta.xml.bind.UnmarshalException"));
         assertTrue(cause.getMessage().contains("org.xml.sax.SAXParseException"));
         assertTrue(cause.getMessage().contains("cvc-complex-type.2.4.b"));
     }
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTest.java
index 9bde308fa29..8969831875a 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationTest.java
@@ -84,7 +84,7 @@ public class JaxbDataFormatSchemaValidationTest extends CamelTestSupport {
 
         Throwable cause = ex.getCause();
         assertIsInstanceOf(IOException.class, cause);
-        assertTrue(cause.getMessage().contains("javax.xml.bind.MarshalException"));
+        assertTrue(cause.getMessage().contains("jakarta.xml.bind.MarshalException"));
         assertTrue(cause.getMessage().contains("org.xml.sax.SAXParseException"));
         assertTrue(cause.getMessage().contains("cvc-complex-type.2.4.a"));
     }
@@ -125,7 +125,7 @@ public class JaxbDataFormatSchemaValidationTest extends CamelTestSupport {
 
         Throwable cause = ex.getCause();
         assertIsInstanceOf(IOException.class, cause);
-        assertTrue(cause.getMessage().contains("javax.xml.bind.UnmarshalException"));
+        assertTrue(cause.getMessage().contains("jakarta.xml.bind.UnmarshalException"));
         assertTrue(cause.getMessage().contains("org.xml.sax.SAXParseException"));
         assertTrue(cause.getMessage().contains("cvc-complex-type.2.4.b"));
     }
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationWithObjectFactoryTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationWithObjectFactoryTest.java
index 56e5b1768b9..68741e95d9b 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationWithObjectFactoryTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatSchemaValidationWithObjectFactoryTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.converter.jaxb;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.EndpointInject;
@@ -68,7 +68,7 @@ public class JaxbDataFormatSchemaValidationWithObjectFactoryTest extends CamelTe
 
         Throwable cause = ex.getCause();
         assertIsInstanceOf(IOException.class, cause);
-        assertTrue(cause.getMessage().contains("javax.xml.bind.MarshalException"));
+        assertTrue(cause.getMessage().contains("jakarta.xml.bind.MarshalException"));
         assertTrue(cause.getMessage().contains("org.xml.sax.SAXParseException"));
         assertTrue(cause.getMessage().contains("cvc-complex-type.2.4.b"));
     }
@@ -88,7 +88,7 @@ public class JaxbDataFormatSchemaValidationWithObjectFactoryTest extends CamelTe
 
         Throwable cause = ex.getCause();
         assertIsInstanceOf(IOException.class, cause);
-        assertTrue(cause.getMessage().contains("javax.xml.bind.UnmarshalException"));
+        assertTrue(cause.getMessage().contains("jakarta.xml.bind.UnmarshalException"));
         assertTrue(cause.getMessage().contains("org.xml.sax.SAXParseException"));
         assertTrue(cause.getMessage().contains("cvc-complex-type.2.4.b"));
     }
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/Address.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/Address.java
index e20247d79ec..6218db9ef1d 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/Address.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/Address.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.converter.jaxb.address;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * <p>
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/ObjectFactory.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/ObjectFactory.java
index a242d0109a0..f165ab5d276 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/ObjectFactory.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/ObjectFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.converter.jaxb.address;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 /**
  * This object contains factory methods for each Java content interface and Java element interface generated in the
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/package-info.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/package-info.java
index 0e38a34b1a4..36f090bb16c 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/package-info.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/package-info.java
@@ -14,6 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@javax.xml.bind.annotation.XmlSchema(namespace = "address.jaxb.converter.camel.apache.org",
-                                     elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "address.jaxb.converter.camel.apache.org",
+                                     elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package org.apache.camel.converter.jaxb.address;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/Message.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/Message.java
index d1281049a4e..0696dd9b4a1 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/Message.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/Message.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.converter.jaxb.message;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * <p>
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/ObjectFactory.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/ObjectFactory.java
index c1ac836ecba..7b3189c4108 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/ObjectFactory.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/ObjectFactory.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.converter.jaxb.message;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 
 /**
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/package-info.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/package-info.java
index bd5591d0b1d..970ab8072c5 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/package-info.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/package-info.java
@@ -14,5 +14,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@javax.xml.bind.annotation.XmlSchema(namespace = "message.jaxb.converter.camel.apache.org")
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "message.jaxb.converter.camel.apache.org")
 package org.apache.camel.converter.jaxb.message;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/ObjectFactory.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/ObjectFactory.java
index 6fdd15042dc..ab2cbf1f002 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/ObjectFactory.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/ObjectFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.converter.jaxb.person;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 /**
  * This object contains factory methods for each Java content interface and Java element interface generated in the
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/Person.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/Person.java
index ebc4556e5c2..49083108d6f 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/Person.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/Person.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.converter.jaxb.person;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.camel.converter.jaxb.address.Address;
 
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/package-info.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/package-info.java
index 512a5781039..f618959e212 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/package-info.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/package-info.java
@@ -14,6 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@javax.xml.bind.annotation.XmlSchema(namespace = "person.jaxb.converter.camel.apache.org",
-                                     elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "person.jaxb.converter.camel.apache.org",
+                                     elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package org.apache.camel.converter.jaxb.person;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/Address.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/Address.java
index 6918ef267c8..8e0a5216a38 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/example/Address.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/Address.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.example;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "Address")
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/Bar.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/Bar.java
index d4a42da51c7..0f9825d9541 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/example/Bar.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/Bar.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.example;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatConcurrentTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatConcurrentTest.java
index 8bc5fc4083b..aef6cea671a 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatConcurrentTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/DataFormatConcurrentTest.java
@@ -22,8 +22,8 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.Marshaller;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitEncodingAndXMLCharFilteringTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitEncodingAndXMLCharFilteringTest.java
index 2dadfd8556a..0394473a161 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitEncodingAndXMLCharFilteringTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitEncodingAndXMLCharFilteringTest.java
@@ -23,8 +23,8 @@ import java.io.Reader;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.Unmarshaller;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitFileEncodingTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitFileEncodingTest.java
index edb83557182..bbf467f1efb 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitFileEncodingTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitFileEncodingTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.example;
 
 import java.nio.file.Path;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.Unmarshaller;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/Foo.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/Foo.java
index b91d9f6495c..638ab4999f9 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/example/Foo.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/Foo.java
@@ -19,11 +19,11 @@ package org.apache.camel.example;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElements;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbErrorLogTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbErrorLogTest.java
index 77cececbadf..a47fe125d80 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbErrorLogTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbErrorLogTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.example;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 import org.apache.camel.Body;
 import org.apache.camel.Handler;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/Order.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/Order.java
index 7d54dcc87b4..2d6b1abc154 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/example/Order.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/Order.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.example;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(namespace = "http://www.camel.apache.org/jaxb/example/order/1")
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/Partial.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/Partial.java
index 94fa0b7cb36..ad9d631a641 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/example/Partial.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/Partial.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.example;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * Partial element without XmlRootElement annotation for partial testing.
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/PurchaseOrder.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/PurchaseOrder.java
index c3612a350cb..d7be6054804 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/example/PurchaseOrder.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/PurchaseOrder.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.example;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 import org.apache.camel.util.ObjectHelper;
 
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/Zot.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/Zot.java
index cfb62d2c3dd..195bb14c2b6 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/example/Zot.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/Zot.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.example;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/package-info.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/package-info.java
index 560bb80682e..204a5862afa 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/example/package-info.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/package-info.java
@@ -21,5 +21,5 @@
            })
 package org.apache.camel.example;
 
-import javax.xml.bind.annotation.XmlNs;
-import javax.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlNs;
+import jakarta.xml.bind.annotation.XmlSchema;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/foo/bar/ObjectFactory.java b/components/camel-jaxb/src/test/java/org/apache/camel/foo/bar/ObjectFactory.java
index dd848b760ab..86f6729a329 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/foo/bar/ObjectFactory.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/foo/bar/ObjectFactory.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.foo.bar;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 
 /**
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/foo/bar/PersonType.java b/components/camel-jaxb/src/test/java/org/apache/camel/foo/bar/PersonType.java
index a78ebc2e63f..8ec0ad97c38 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/foo/bar/PersonType.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/foo/bar/PersonType.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.foo.bar;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.camel.util.ObjectHelper;
 
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbTest.java
index f525363a30d..17904d53c19 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/CamelJaxbTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.jaxb;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.Exchange;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatIssueTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatIssueTest.java
index e6a96f82da8..76f6ed69e5b 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatIssueTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatIssueTest.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.jaxb;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatMustBeJAXBElementTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatMustBeJAXBElementTest.java
index 3d470065438..d8185656d8c 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatMustBeJAXBElementTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/JaxbDataFormatMustBeJAXBElementTest.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.jaxb;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.InvalidPayloadException;
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/NotificationType.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/NotificationType.java
index 4e927561a1a..f352016f1ab 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/NotificationType.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/NotificationType.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.jaxb;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 @XmlRootElement(name = "Notification")
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java
index 2a7084c3182..4a617f4f19e 100644
--- a/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java
+++ b/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/SplitterAndExceptionRouteTwistIssueTest.java
@@ -20,11 +20,11 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
diff --git a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java
index 4f7cbe3cd08..4c675c4adc3 100644
--- a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java
+++ b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java
@@ -20,7 +20,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
 
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MediaType;
 
 import com.google.common.base.Strings;
 import org.jclouds.blobstore.BlobStore;
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
index 3a542729d73..d29ec69c55d 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelContinuationServlet.java
@@ -23,9 +23,9 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.Exchange;
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelFilterWrapper.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelFilterWrapper.java
index f66543ddc37..4b51b2a4198 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelFilterWrapper.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelFilterWrapper.java
@@ -20,12 +20,12 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -59,7 +59,7 @@ public class CamelFilterWrapper implements Filter {
 
     @Override
     public void init(FilterConfig config) throws ServletException {
-        Object o = config.getServletContext().getAttribute("javax.servlet.context.tempdir");
+        Object o = config.getServletContext().getAttribute("jakarta.servlet.context.tempdir");
         if (o == null) {
             //when run in embedded mode, Jetty 8 will forget to set this property,
             //but the MultiPartFilter requires it (will NPE if not set) so we'll 
@@ -70,7 +70,7 @@ public class CamelFilterWrapper implements Filter {
                 if (!result) {
                     LOG.error("failed to delete {}", file);
                 }
-                config.getServletContext().setAttribute("javax.servlet.context.tempdir",
+                config.getServletContext().setAttribute("jakarta.servlet.context.tempdir",
                         file.getParentFile());
             } catch (IOException e) {
                 //ignore
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java
index 3af7105f9f8..8aa93bbf476 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.jetty;
 
-import javax.servlet.Filter;
+import jakarta.servlet.Filter;
 
 /**
  * Please use the CamelFilterWrapper instead of using this classs
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index c69a50c96ae..9bbb6b9ef80 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -31,12 +31,12 @@ import java.util.List;
 import java.util.Map;
 
 import javax.management.MBeanServer;
-import javax.servlet.Filter;
-import javax.servlet.MultipartConfigElement;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.MultipartConfigElement;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Consumer;
@@ -436,7 +436,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent
                         "The temp file directory of camel-jetty is not exists, please recheck it with directory name :"
                                                 + camelContext.getGlobalOptions().get(TMP_DIR));
             }
-            context.setAttribute("javax.servlet.context.tempdir", file);
+            context.setAttribute("jakarta.servlet.context.tempdir", file);
         }
         // if a filter ref was provided, use it.
         Filter filter = ((JettyHttpEndpoint) endpoint).getMultipartFilter();
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
index 1eda82dbe82..16fc9ccf223 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
@@ -20,7 +20,7 @@ import java.net.URI;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.Filter;
+import jakarta.servlet.Filter;
 
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyRestHttpBinding.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyRestHttpBinding.java
index 147e8fa563b..e6205c117a2 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyRestHttpBinding.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyRestHttpBinding.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.jetty;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.camel.http.common.DefaultHttpBinding;
 import org.apache.camel.http.common.HttpCommonEndpoint;
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/MultiPartFilter.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/MultiPartFilter.java
index 0a3392def04..fd03e944f8e 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/MultiPartFilter.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/MultiPartFilter.java
@@ -19,13 +19,13 @@ package org.apache.camel.component.jetty;
 
 import java.io.IOException;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * To enable handle attachments with Jetty 9 when this filter is set.
diff --git a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9Configurer.java b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9Configurer.java
index 5e258336b5f..104821f1cb9 100644
--- a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9Configurer.java
+++ b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttpEndpoint9Configurer.java
@@ -60,7 +60,7 @@ public class JettyHttpEndpoint9Configurer extends PropertyConfigurerSupport impl
         case "matchonuriprefix":
         case "matchOnUriPrefix": target.setMatchOnUriPrefix(property(camelContext, boolean.class, value)); return true;
         case "multipartfilter":
-        case "multipartFilter": target.setMultipartFilter(property(camelContext, javax.servlet.Filter.class, value)); return true;
+        case "multipartFilter": target.setMultipartFilter(property(camelContext, jakarta.servlet.Filter.class, value)); return true;
         case "muteexception":
         case "muteException": target.setMuteException(property(camelContext, boolean.class, value)); return true;
         case "optionsenabled":
@@ -127,7 +127,7 @@ public class JettyHttpEndpoint9Configurer extends PropertyConfigurerSupport impl
         case "matchonuriprefix":
         case "matchOnUriPrefix": return boolean.class;
         case "multipartfilter":
-        case "multipartFilter": return javax.servlet.Filter.class;
+        case "multipartFilter": return jakarta.servlet.Filter.class;
         case "muteexception":
         case "muteException": return boolean.class;
         case "optionsenabled":
@@ -225,7 +225,7 @@ public class JettyHttpEndpoint9Configurer extends PropertyConfigurerSupport impl
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "filterinitparameters":
         case "filterInitParameters": return java.lang.String.class;
-        case "filters": return javax.servlet.Filter.class;
+        case "filters": return jakarta.servlet.Filter.class;
         case "handlers": return org.eclipse.jetty.server.Handler.class;
         default: return null;
         }
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/AttachmentHttpBinding.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/AttachmentHttpBinding.java
index d7b54b1d1a7..bfb5288ac61 100644
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/AttachmentHttpBinding.java
+++ b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty9/AttachmentHttpBinding.java
@@ -23,10 +23,10 @@ import java.util.Collection;
 import java.util.Enumeration;
 import java.util.Map;
 
-import javax.activation.DataHandler;
-import javax.activation.DataSource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.Part;
+import jakarta.activation.DataHandler;
+import jakarta.activation.DataSource;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Part;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.RuntimeCamelException;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/CustomFiltersTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/CustomFiltersTest.java
index 4c1127d70a4..28107e03e39 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/CustomFiltersTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/CustomFiltersTest.java
@@ -20,13 +20,13 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.Exchange;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitJettyAsyncRouteTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitJettyAsyncRouteTest.java
index 498e45aca0c..6aebea9a36b 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitJettyAsyncRouteTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitJettyAsyncRouteTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.jetty;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitJettyRouteTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitJettyRouteTest.java
index 13a0034bc90..771b5326bf8 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitJettyRouteTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/ExplicitJettyRouteTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.jetty;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java
index 68a0804e16b..e437a65410a 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpAuthMethodPriorityTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.jetty;
 import java.security.Principal;
 import java.util.Arrays;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.Exchange;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java
index cfa6d564ffb..f96fd607b18 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthComponentConfiguredTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.jetty;
 import java.security.Principal;
 import java.util.Arrays;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.Exchange;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java
index 3d5143e6d26..61990160c21 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBasicAuthTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.jetty;
 import java.security.Principal;
 import java.util.Arrays;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.Exchange;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBindingRefTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBindingRefTest.java
index 78874efb689..b07e5b98fb0 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBindingRefTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBindingRefTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.jetty;
 
 import java.io.IOException;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.Exchange;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpConverterTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpConverterTest.java
index 4552de5116b..c8a934cf78a 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpConverterTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpConverterTest.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.jetty;
 
 import java.io.InputStream;
 
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpGZipEncodingTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpGZipEncodingTest.java
index 0b6ea62393e..bf955f6ae37 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpGZipEncodingTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpGZipEncodingTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.jetty;
 
 import java.io.ByteArrayInputStream;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpHeaderTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpHeaderTest.java
index 88b05f7fda3..4e15d204e3b 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpHeaderTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpHeaderTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.jetty;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRequestResponseTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRequestResponseTest.java
index c94f1e6a780..31e81d16437 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRequestResponseTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRequestResponseTest.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.component.jetty;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java
index efc59d78e7a..12142982029 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpRouteTest.java
@@ -23,7 +23,7 @@ import java.net.URL;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteTest.java
index 9aca8caebc7..de61a48fbd4 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.jetty;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithSocketPropertiesTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithSocketPropertiesTest.java
index 182bbef8802..207946ff3c1 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithSocketPropertiesTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyRouteWithSocketPropertiesTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.jetty;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java
index eadb33158e5..9393cb70022 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.jetty;
 
 import java.io.File;
 
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormWithCustomFilterTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormWithCustomFilterTest.java
index cdb4307fc35..8041c26d9f7 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormWithCustomFilterTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormWithCustomFilterTest.java
@@ -19,12 +19,12 @@ package org.apache.camel.component.jetty;
 import java.io.File;
 import java.io.IOException;
 
-import javax.activation.DataHandler;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.activation.DataHandler;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.Exchange;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MyErrorHandler.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MyErrorHandler.java
index 0bdb72c2ad1..f287d4d9cb1 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MyErrorHandler.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MyErrorHandler.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.jetty;
 import java.io.IOException;
 import java.io.Writer;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.eclipse.jetty.server.handler.ErrorHandler;
 
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java
index 60434c55969..f02fffbe091 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java
@@ -21,7 +21,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/MyCustomHttpBinding.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/MyCustomHttpBinding.java
index 1095005bfab..be4d46655a8 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/MyCustomHttpBinding.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/MyCustomHttpBinding.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.jetty.rest;
 
 import java.io.IOException;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/MyLoginService.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/MyLoginService.java
index 0812c40364e..592576a27d2 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/MyLoginService.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/MyLoginService.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.jetty.rest;
 import java.security.Principal;
 
 import javax.security.auth.Subject;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
 
 import org.eclipse.jetty.security.DefaultIdentityService;
 import org.eclipse.jetty.security.IdentityService;
diff --git a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/UserJaxbPojo.java b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/UserJaxbPojo.java
index 275e7151879..086f467c87c 100644
--- a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/UserJaxbPojo.java
+++ b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/UserJaxbPojo.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.component.jetty.rest;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "user")
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsComponentConfigurer.java b/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsComponentConfigurer.java
index 82d7c5ae430..5de21fe9197 100644
--- a/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsComponentConfigurer.java
+++ b/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsComponentConfigurer.java
@@ -70,7 +70,7 @@ public class JmsComponentConfigurer extends PropertyConfigurerSupport implements
         case "concurrentConsumers": getOrCreateConfiguration(target).setConcurrentConsumers(property(camelContext, int.class, value)); return true;
         case "configuration": target.setConfiguration(property(camelContext, org.apache.camel.component.jms.JmsConfiguration.class, value)); return true;
         case "connectionfactory":
-        case "connectionFactory": getOrCreateConfiguration(target).setConnectionFactory(property(camelContext, javax.jms.ConnectionFactory.class, value)); return true;
+        case "connectionFactory": getOrCreateConfiguration(target).setConnectionFactory(property(camelContext, jakarta.jms.ConnectionFactory.class, value)); return true;
         case "consumertype":
         case "consumerType": getOrCreateConfiguration(target).setConsumerType(property(camelContext, org.apache.camel.component.jms.ConsumerType.class, value)); return true;
         case "correlationproperty":
@@ -102,7 +102,7 @@ public class JmsComponentConfigurer extends PropertyConfigurerSupport implements
         case "errorhandlerlogginglevel":
         case "errorHandlerLoggingLevel": getOrCreateConfiguration(target).setErrorHandlerLoggingLevel(property(camelContext, org.apache.camel.LoggingLevel.class, value)); return true;
         case "exceptionlistener":
-        case "exceptionListener": getOrCreateConfiguration(target).setExceptionListener(property(camelContext, javax.jms.ExceptionListener.class, value)); return true;
+        case "exceptionListener": getOrCreateConfiguration(target).setExceptionListener(property(camelContext, jakarta.jms.ExceptionListener.class, value)); return true;
         case "explicitqosenabled":
         case "explicitQosEnabled": getOrCreateConfiguration(target).setExplicitQosEnabled(property(camelContext, java.lang.Boolean.class, value)); return true;
         case "exposelistenersession":
@@ -268,7 +268,7 @@ public class JmsComponentConfigurer extends PropertyConfigurerSupport implements
         case "concurrentConsumers": return int.class;
         case "configuration": return org.apache.camel.component.jms.JmsConfiguration.class;
         case "connectionfactory":
-        case "connectionFactory": return javax.jms.ConnectionFactory.class;
+        case "connectionFactory": return jakarta.jms.ConnectionFactory.class;
         case "consumertype":
         case "consumerType": return org.apache.camel.component.jms.ConsumerType.class;
         case "correlationproperty":
@@ -300,7 +300,7 @@ public class JmsComponentConfigurer extends PropertyConfigurerSupport implements
         case "errorhandlerlogginglevel":
         case "errorHandlerLoggingLevel": return org.apache.camel.LoggingLevel.class;
         case "exceptionlistener":
-        case "exceptionListener": return javax.jms.ExceptionListener.class;
+        case "exceptionListener": return jakarta.jms.ExceptionListener.class;
         case "explicitqosenabled":
         case "explicitQosEnabled": return java.lang.Boolean.class;
         case "exposelistenersession":
diff --git a/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsEndpointConfigurer.java b/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsEndpointConfigurer.java
index 58926231cf2..aa6e21c00fa 100644
--- a/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsEndpointConfigurer.java
+++ b/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsEndpointConfigurer.java
@@ -56,7 +56,7 @@ public class JmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "concurrentconsumers":
         case "concurrentConsumers": target.getConfiguration().setConcurrentConsumers(property(camelContext, int.class, value)); return true;
         case "connectionfactory":
-        case "connectionFactory": target.getConfiguration().setConnectionFactory(property(camelContext, javax.jms.ConnectionFactory.class, value)); return true;
+        case "connectionFactory": target.getConfiguration().setConnectionFactory(property(camelContext, jakarta.jms.ConnectionFactory.class, value)); return true;
         case "consumertype":
         case "consumerType": target.getConfiguration().setConsumerType(property(camelContext, org.apache.camel.component.jms.ConsumerType.class, value)); return true;
         case "correlationproperty":
@@ -90,7 +90,7 @@ public class JmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "exceptionhandler":
         case "exceptionHandler": target.setExceptionHandler(property(camelContext, org.apache.camel.spi.ExceptionHandler.class, value)); return true;
         case "exceptionlistener":
-        case "exceptionListener": target.getConfiguration().setExceptionListener(property(camelContext, javax.jms.ExceptionListener.class, value)); return true;
+        case "exceptionListener": target.getConfiguration().setExceptionListener(property(camelContext, jakarta.jms.ExceptionListener.class, value)); return true;
         case "exchangepattern":
         case "exchangePattern": target.setExchangePattern(property(camelContext, org.apache.camel.ExchangePattern.class, value)); return true;
         case "explicitqosenabled":
@@ -249,7 +249,7 @@ public class JmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "concurrentconsumers":
         case "concurrentConsumers": return int.class;
         case "connectionfactory":
-        case "connectionFactory": return javax.jms.ConnectionFactory.class;
+        case "connectionFactory": return jakarta.jms.ConnectionFactory.class;
         case "consumertype":
         case "consumerType": return org.apache.camel.component.jms.ConsumerType.class;
         case "correlationproperty":
@@ -283,7 +283,7 @@ public class JmsEndpointConfigurer extends PropertyConfigurerSupport implements
         case "exceptionhandler":
         case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
         case "exceptionlistener":
-        case "exceptionListener": return javax.jms.ExceptionListener.class;
+        case "exceptionListener": return jakarta.jms.ExceptionListener.class;
         case "exchangepattern":
         case "exchangePattern": return org.apache.camel.ExchangePattern.class;
         case "explicitqosenabled":
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultQueueBrowseStrategy.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultQueueBrowseStrategy.java
index 4f349f510f3..ed89501af06 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultQueueBrowseStrategy.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultQueueBrowseStrategy.java
@@ -20,10 +20,10 @@ import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
 
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.QueueBrowser;
-import javax.jms.Session;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.QueueBrowser;
+import jakarta.jms.Session;
 
 import org.apache.camel.Exchange;
 import org.springframework.jms.core.BrowserCallback;
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/DestinationEndpoint.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/DestinationEndpoint.java
index bbb87b5f739..f0f4f384e2c 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/DestinationEndpoint.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/DestinationEndpoint.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.component.jms;
 
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Session;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Session;
 
 /**
  * An optional interface that a {@link JmsEndpoint} may implement to return the underlying {@link Destination} object
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
index 3f2df72ced7..be704310287 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.component.jms;
 
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.Session;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageListener;
+import jakarta.jms.Session;
 
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.AsyncProcessor;
@@ -346,7 +346,7 @@ public class EndpointMessageListener implements SessionAwareMessageListener {
      * Provides an explicit reply to destination which overrides any incoming value of {@link Message#getJMSReplyTo()}
      *
      * @param replyToDestination the destination that should be used to send replies to as either a String or
-     *                           {@link javax.jms.Destination} type.
+     *                           {@link jakarta.jms.Destination} type.
      */
     public void setReplyToDestination(Object replyToDestination) {
         this.replyToDestination = replyToDestination;
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/InOnlyMessageSentCallback.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/InOnlyMessageSentCallback.java
index 78e26712545..a3a201d2b38 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/InOnlyMessageSentCallback.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/InOnlyMessageSentCallback.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.component.jms;
 
-import javax.jms.Destination;
-import javax.jms.Message;
-import javax.jms.Session;
+import jakarta.jms.Destination;
+import jakarta.jms.Message;
+import jakarta.jms.Session;
 
 import org.apache.camel.Exchange;
 
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
index 76f2fd8e65a..b031c86eb97 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
@@ -34,16 +34,16 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import javax.jms.BytesMessage;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.MessageFormatException;
-import javax.jms.ObjectMessage;
-import javax.jms.Session;
-import javax.jms.StreamMessage;
... 20554 lines suppressed ...


[camel] 02/08: Switch to 4.0.0-SNAPSHOT

Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch jakarta-rewritten
in repository https://gitbox.apache.org/repos/asf/camel.git

commit cc82f0cd7e2e028a5b4f9d74ab0038cd34befb17
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Nov 25 21:54:42 2022 +0100

    Switch to 4.0.0-SNAPSHOT
---
 apache-camel/pom.xml                               |   2 +-
 archetypes/camel-archetype-api-component/pom.xml   |   2 +-
 archetypes/camel-archetype-cdi/pom.xml             |   2 +-
 archetypes/camel-archetype-component/pom.xml       |   2 +-
 archetypes/camel-archetype-dataformat/pom.xml      |   2 +-
 archetypes/camel-archetype-java/pom.xml            |   2 +-
 archetypes/camel-archetype-main/pom.xml            |   2 +-
 archetypes/camel-archetype-spring/pom.xml          |   2 +-
 archetypes/pom.xml                                 |   2 +-
 bom/camel-bom/pom.xml                              |   2 +-
 bom/pom.xml                                        |   2 +-
 buildingtools/pom.xml                              |   2 +-
 camel-dependencies/pom.xml                         |   2 +-
 catalog/camel-allcomponents/pom.xml                |   2 +-
 catalog/camel-catalog-console/pom.xml              |   2 +-
 catalog/camel-catalog-lucene/pom.xml               |   2 +-
 catalog/camel-catalog-maven/pom.xml                |   2 +-
 catalog/camel-catalog/pom.xml                      |   2 +-
 .../apache/camel/catalog/components/activemq.json  |   2 +-
 .../org/apache/camel/catalog/components/amqp.json  |   2 +-
 .../apache/camel/catalog/components/arangodb.json  |   2 +-
 .../org/apache/camel/catalog/components/as2.json   |   2 +-
 .../apache/camel/catalog/components/asterisk.json  |   2 +-
 .../apache/camel/catalog/components/atlasmap.json  |   2 +-
 .../org/apache/camel/catalog/components/atmos.json |   2 +-
 .../catalog/components/atmosphere-websocket.json   |   2 +-
 .../org/apache/camel/catalog/components/atom.json  |   2 +-
 .../org/apache/camel/catalog/components/avro.json  |   2 +-
 .../camel/catalog/components/aws-cloudtrail.json   |   2 +-
 .../catalog/components/aws-secrets-manager.json    |   2 +-
 .../camel/catalog/components/aws2-athena.json      |   2 +-
 .../apache/camel/catalog/components/aws2-cw.json   |   2 +-
 .../apache/camel/catalog/components/aws2-ddb.json  |   2 +-
 .../camel/catalog/components/aws2-ddbstream.json   |   2 +-
 .../apache/camel/catalog/components/aws2-ec2.json  |   2 +-
 .../apache/camel/catalog/components/aws2-ecs.json  |   2 +-
 .../apache/camel/catalog/components/aws2-eks.json  |   2 +-
 .../camel/catalog/components/aws2-eventbridge.json |   2 +-
 .../apache/camel/catalog/components/aws2-iam.json  |   2 +-
 .../catalog/components/aws2-kinesis-firehose.json  |   2 +-
 .../camel/catalog/components/aws2-kinesis.json     |   2 +-
 .../apache/camel/catalog/components/aws2-kms.json  |   2 +-
 .../camel/catalog/components/aws2-lambda.json      |   2 +-
 .../apache/camel/catalog/components/aws2-mq.json   |   2 +-
 .../apache/camel/catalog/components/aws2-msk.json  |   2 +-
 .../apache/camel/catalog/components/aws2-s3.json   |   2 +-
 .../apache/camel/catalog/components/aws2-ses.json  |   2 +-
 .../apache/camel/catalog/components/aws2-sns.json  |   2 +-
 .../apache/camel/catalog/components/aws2-sqs.json  |   2 +-
 .../apache/camel/catalog/components/aws2-sts.json  |   2 +-
 .../camel/catalog/components/aws2-translate.json   |   2 +-
 .../camel/catalog/components/azure-cosmosdb.json   |   2 +-
 .../camel/catalog/components/azure-eventhubs.json  |   2 +-
 .../camel/catalog/components/azure-key-vault.json  |   2 +-
 .../camel/catalog/components/azure-servicebus.json |   2 +-
 .../catalog/components/azure-storage-blob.json     |   2 +-
 .../catalog/components/azure-storage-datalake.json |   2 +-
 .../catalog/components/azure-storage-queue.json    |   2 +-
 .../camel/catalog/components/bean-validator.json   |   2 +-
 .../org/apache/camel/catalog/components/bean.json  |   2 +-
 .../apache/camel/catalog/components/bonita.json    |   2 +-
 .../org/apache/camel/catalog/components/box.json   |   2 +-
 .../apache/camel/catalog/components/braintree.json |   2 +-
 .../apache/camel/catalog/components/browse.json    |   2 +-
 .../camel/catalog/components/caffeine-cache.json   |   2 +-
 .../catalog/components/caffeine-loadcache.json     |   2 +-
 .../camel/catalog/components/chatscript.json       |   2 +-
 .../org/apache/camel/catalog/components/chunk.json |   2 +-
 .../org/apache/camel/catalog/components/class.json |   2 +-
 .../apache/camel/catalog/components/cm-sms.json    |   2 +-
 .../org/apache/camel/catalog/components/cmis.json  |   2 +-
 .../apache/camel/catalog/components/coap+tcp.json  |   2 +-
 .../org/apache/camel/catalog/components/coap.json  |   2 +-
 .../apache/camel/catalog/components/coaps+tcp.json |   2 +-
 .../org/apache/camel/catalog/components/coaps.json |   2 +-
 .../apache/camel/catalog/components/cometd.json    |   2 +-
 .../apache/camel/catalog/components/cometds.json   |   2 +-
 .../apache/camel/catalog/components/consul.json    |   2 +-
 .../camel/catalog/components/controlbus.json       |   2 +-
 .../org/apache/camel/catalog/components/corda.json |   2 +-
 .../apache/camel/catalog/components/couchbase.json |   2 +-
 .../apache/camel/catalog/components/couchdb.json   |   2 +-
 .../org/apache/camel/catalog/components/cql.json   |   2 +-
 .../org/apache/camel/catalog/components/cron.json  |   2 +-
 .../apache/camel/catalog/components/crypto.json    |   2 +-
 .../org/apache/camel/catalog/components/cxf.json   |   2 +-
 .../org/apache/camel/catalog/components/cxfrs.json |   2 +-
 .../camel/catalog/components/dataformat.json       |   2 +-
 .../camel/catalog/components/dataset-test.json     |   2 +-
 .../apache/camel/catalog/components/dataset.json   |   2 +-
 .../camel/catalog/components/debezium-db2.json     |   2 +-
 .../camel/catalog/components/debezium-mongodb.json |   2 +-
 .../camel/catalog/components/debezium-mysql.json   |   2 +-
 .../camel/catalog/components/debezium-oracle.json  |   2 +-
 .../catalog/components/debezium-postgres.json      |   2 +-
 .../catalog/components/debezium-sqlserver.json     |   2 +-
 .../camel/catalog/components/digitalocean.json     |   2 +-
 .../apache/camel/catalog/components/direct-vm.json |   2 +-
 .../apache/camel/catalog/components/direct.json    |   2 +-
 .../camel/catalog/components/disruptor-vm.json     |   2 +-
 .../apache/camel/catalog/components/disruptor.json |   2 +-
 .../org/apache/camel/catalog/components/djl.json   |   2 +-
 .../org/apache/camel/catalog/components/dns.json   |   2 +-
 .../apache/camel/catalog/components/docker.json    |   2 +-
 .../org/apache/camel/catalog/components/dozer.json |   2 +-
 .../org/apache/camel/catalog/components/drill.json |   2 +-
 .../apache/camel/catalog/components/dropbox.json   |   2 +-
 .../camel/catalog/components/dynamic-router.json   |   2 +-
 .../apache/camel/catalog/components/ehcache.json   |   2 +-
 .../catalog/components/elasticsearch-rest.json     |   2 +-
 .../camel/catalog/components/elasticsearch.json    |   2 +-
 .../org/apache/camel/catalog/components/etcd3.json |   2 +-
 .../org/apache/camel/catalog/components/exec.json  |   2 +-
 .../apache/camel/catalog/components/facebook.json  |   2 +-
 .../org/apache/camel/catalog/components/fhir.json  |   2 +-
 .../camel/catalog/components/file-watch.json       |   2 +-
 .../org/apache/camel/catalog/components/file.json  |   2 +-
 .../apache/camel/catalog/components/flatpack.json  |   2 +-
 .../org/apache/camel/catalog/components/flink.json |   2 +-
 .../org/apache/camel/catalog/components/fop.json   |   2 +-
 .../camel/catalog/components/freemarker.json       |   2 +-
 .../org/apache/camel/catalog/components/ftp.json   |   2 +-
 .../org/apache/camel/catalog/components/ftps.json  |   2 +-
 .../apache/camel/catalog/components/geocoder.json  |   2 +-
 .../org/apache/camel/catalog/components/git.json   |   2 +-
 .../apache/camel/catalog/components/github.json    |   2 +-
 .../catalog/components/google-bigquery-sql.json    |   2 +-
 .../camel/catalog/components/google-bigquery.json  |   2 +-
 .../catalog/components/google-calendar-stream.json |   2 +-
 .../camel/catalog/components/google-calendar.json  |   2 +-
 .../camel/catalog/components/google-drive.json     |   2 +-
 .../camel/catalog/components/google-functions.json |   2 +-
 .../catalog/components/google-mail-stream.json     |   2 +-
 .../camel/catalog/components/google-mail.json      |   2 +-
 .../camel/catalog/components/google-pubsub.json    |   2 +-
 .../catalog/components/google-secret-manager.json  |   2 +-
 .../catalog/components/google-sheets-stream.json   |   2 +-
 .../camel/catalog/components/google-sheets.json    |   2 +-
 .../camel/catalog/components/google-storage.json   |   2 +-
 .../org/apache/camel/catalog/components/gora.json  |   2 +-
 .../org/apache/camel/catalog/components/grape.json |   2 +-
 .../apache/camel/catalog/components/graphql.json   |   2 +-
 .../org/apache/camel/catalog/components/grpc.json  |   2 +-
 .../camel/catalog/components/guava-eventbus.json   |   2 +-
 .../camel/catalog/components/hashicorp-vault.json  |   2 +-
 .../catalog/components/hazelcast-atomicvalue.json  |   2 +-
 .../catalog/components/hazelcast-instance.json     |   2 +-
 .../camel/catalog/components/hazelcast-list.json   |   2 +-
 .../camel/catalog/components/hazelcast-map.json    |   2 +-
 .../catalog/components/hazelcast-multimap.json     |   2 +-
 .../camel/catalog/components/hazelcast-queue.json  |   2 +-
 .../components/hazelcast-replicatedmap.json        |   2 +-
 .../catalog/components/hazelcast-ringbuffer.json   |   2 +-
 .../camel/catalog/components/hazelcast-seda.json   |   2 +-
 .../camel/catalog/components/hazelcast-set.json    |   2 +-
 .../camel/catalog/components/hazelcast-topic.json  |   2 +-
 .../org/apache/camel/catalog/components/hbase.json |   2 +-
 .../org/apache/camel/catalog/components/hdfs.json  |   2 +-
 .../org/apache/camel/catalog/components/http.json  |   2 +-
 .../org/apache/camel/catalog/components/https.json |   2 +-
 .../camel/catalog/components/hwcloud-dms.json      |   2 +-
 .../camel/catalog/components/hwcloud-frs.json      |   2 +-
 .../catalog/components/hwcloud-functiongraph.json  |   2 +-
 .../camel/catalog/components/hwcloud-iam.json      |   2 +-
 .../components/hwcloud-imagerecognition.json       |   2 +-
 .../camel/catalog/components/hwcloud-obs.json      |   2 +-
 .../camel/catalog/components/hwcloud-smn.json      |   2 +-
 .../catalog/components/hyperledger-aries.json      |   2 +-
 .../camel/catalog/components/iec60870-client.json  |   2 +-
 .../camel/catalog/components/iec60870-server.json  |   2 +-
 .../camel/catalog/components/ignite-cache.json     |   2 +-
 .../camel/catalog/components/ignite-compute.json   |   2 +-
 .../camel/catalog/components/ignite-events.json    |   2 +-
 .../camel/catalog/components/ignite-idgen.json     |   2 +-
 .../camel/catalog/components/ignite-messaging.json |   2 +-
 .../camel/catalog/components/ignite-queue.json     |   2 +-
 .../camel/catalog/components/ignite-set.json       |   2 +-
 .../org/apache/camel/catalog/components/imap.json  |   2 +-
 .../org/apache/camel/catalog/components/imaps.json |   2 +-
 .../catalog/components/infinispan-embedded.json    |   2 +-
 .../camel/catalog/components/infinispan.json       |   2 +-
 .../apache/camel/catalog/components/influxdb.json  |   2 +-
 .../org/apache/camel/catalog/components/iota.json  |   2 +-
 .../org/apache/camel/catalog/components/ipfs.json  |   2 +-
 .../org/apache/camel/catalog/components/irc.json   |   2 +-
 .../apache/camel/catalog/components/ironmq.json    |   2 +-
 .../org/apache/camel/catalog/components/jbpm.json  |   2 +-
 .../apache/camel/catalog/components/jcache.json    |   2 +-
 .../apache/camel/catalog/components/jclouds.json   |   2 +-
 .../org/apache/camel/catalog/components/jcr.json   |   2 +-
 .../org/apache/camel/catalog/components/jdbc.json  |   2 +-
 .../org/apache/camel/catalog/components/jetty.json |   2 +-
 .../camel/catalog/components/jgroups-raft.json     |   2 +-
 .../apache/camel/catalog/components/jgroups.json   |   2 +-
 .../org/apache/camel/catalog/components/jira.json  |   2 +-
 .../org/apache/camel/catalog/components/jms.json   |   2 +-
 .../org/apache/camel/catalog/components/jmx.json   |   2 +-
 .../org/apache/camel/catalog/components/jolt.json  |   2 +-
 .../org/apache/camel/catalog/components/jooq.json  |   2 +-
 .../org/apache/camel/catalog/components/jpa.json   |   2 +-
 .../org/apache/camel/catalog/components/jslt.json  |   2 +-
 .../camel/catalog/components/json-patch.json       |   2 +-
 .../camel/catalog/components/json-validator.json   |   2 +-
 .../apache/camel/catalog/components/jsonata.json   |   2 +-
 .../org/apache/camel/catalog/components/jt400.json |   2 +-
 .../org/apache/camel/catalog/components/kafka.json |   2 +-
 .../apache/camel/catalog/components/kamelet.json   |   2 +-
 .../apache/camel/catalog/components/knative.json   |   2 +-
 .../catalog/components/kubernetes-config-maps.json |   2 +-
 .../components/kubernetes-custom-resources.json    |   2 +-
 .../catalog/components/kubernetes-deployments.json |   2 +-
 .../catalog/components/kubernetes-events.json      |   2 +-
 .../camel/catalog/components/kubernetes-hpa.json   |   2 +-
 .../camel/catalog/components/kubernetes-job.json   |   2 +-
 .../catalog/components/kubernetes-namespaces.json  |   2 +-
 .../camel/catalog/components/kubernetes-nodes.json |   2 +-
 .../kubernetes-persistent-volumes-claims.json      |   2 +-
 .../components/kubernetes-persistent-volumes.json  |   2 +-
 .../camel/catalog/components/kubernetes-pods.json  |   2 +-
 .../kubernetes-replication-controllers.json        |   2 +-
 .../components/kubernetes-resources-quota.json     |   2 +-
 .../catalog/components/kubernetes-secrets.json     |   2 +-
 .../components/kubernetes-service-accounts.json    |   2 +-
 .../catalog/components/kubernetes-services.json    |   2 +-
 .../org/apache/camel/catalog/components/kudu.json  |   2 +-
 .../apache/camel/catalog/components/language.json  |   2 +-
 .../org/apache/camel/catalog/components/ldap.json  |   2 +-
 .../org/apache/camel/catalog/components/ldif.json  |   2 +-
 .../org/apache/camel/catalog/components/log.json   |   2 +-
 .../org/apache/camel/catalog/components/lpr.json   |   2 +-
 .../apache/camel/catalog/components/lucene.json    |   2 +-
 .../camel/catalog/components/lumberjack.json       |   2 +-
 .../apache/camel/catalog/components/mapstruct.json |   2 +-
 .../apache/camel/catalog/components/master.json    |   2 +-
 .../apache/camel/catalog/components/metrics.json   |   2 +-
 .../camel/catalog/components/micrometer.json       |   2 +-
 .../catalog/components/microprofile-metrics.json   |   2 +-
 .../camel/catalog/components/milo-browse.json      |   2 +-
 .../camel/catalog/components/milo-client.json      |   2 +-
 .../camel/catalog/components/milo-server.json      |   2 +-
 .../org/apache/camel/catalog/components/mina.json  |   2 +-
 .../org/apache/camel/catalog/components/minio.json |   2 +-
 .../org/apache/camel/catalog/components/mllp.json  |   2 +-
 .../org/apache/camel/catalog/components/mock.json  |   2 +-
 .../camel/catalog/components/mongodb-gridfs.json   |   2 +-
 .../apache/camel/catalog/components/mongodb.json   |   2 +-
 .../apache/camel/catalog/components/mustache.json  |   2 +-
 .../org/apache/camel/catalog/components/mvel.json  |   2 +-
 .../camel/catalog/components/mybatis-bean.json     |   2 +-
 .../apache/camel/catalog/components/mybatis.json   |   2 +-
 .../org/apache/camel/catalog/components/nats.json  |   2 +-
 .../camel/catalog/components/netty-http.json       |   2 +-
 .../org/apache/camel/catalog/components/netty.json |   2 +-
 .../apache/camel/catalog/components/nitrite.json   |   2 +-
 .../apache/camel/catalog/components/oaipmh.json    |   2 +-
 .../apache/camel/catalog/components/olingo2.json   |   2 +-
 .../apache/camel/catalog/components/olingo4.json   |   2 +-
 .../components/openshift-build-configs.json        |   2 +-
 .../camel/catalog/components/openshift-builds.json |   2 +-
 .../components/openshift-deploymentconfigs.json    |   2 +-
 .../camel/catalog/components/openstack-cinder.json |   2 +-
 .../camel/catalog/components/openstack-glance.json |   2 +-
 .../catalog/components/openstack-keystone.json     |   2 +-
 .../catalog/components/openstack-neutron.json      |   2 +-
 .../camel/catalog/components/openstack-nova.json   |   2 +-
 .../camel/catalog/components/openstack-swift.json  |   2 +-
 .../camel/catalog/components/optaplanner.json      |   2 +-
 .../camel/catalog/components/paho-mqtt5.json       |   2 +-
 .../org/apache/camel/catalog/components/paho.json  |   2 +-
 .../org/apache/camel/catalog/components/pdf.json   |   2 +-
 .../catalog/components/pg-replication-slot.json    |   2 +-
 .../apache/camel/catalog/components/pgevent.json   |   2 +-
 .../camel/catalog/components/platform-http.json    |   2 +-
 .../org/apache/camel/catalog/components/plc4x.json |   2 +-
 .../org/apache/camel/catalog/components/pop3.json  |   2 +-
 .../org/apache/camel/catalog/components/pop3s.json |   2 +-
 .../apache/camel/catalog/components/pubnub.json    |   2 +-
 .../apache/camel/catalog/components/pulsar.json    |   2 +-
 .../apache/camel/catalog/components/quartz.json    |   2 +-
 .../apache/camel/catalog/components/quickfix.json  |   2 +-
 .../apache/camel/catalog/components/rabbitmq.json  |   2 +-
 .../camel/catalog/components/reactive-streams.json |   2 +-
 .../org/apache/camel/catalog/components/ref.json   |   2 +-
 .../apache/camel/catalog/components/rest-api.json  |   2 +-
 .../camel/catalog/components/rest-openapi.json     |   2 +-
 .../camel/catalog/components/rest-swagger.json     |   2 +-
 .../org/apache/camel/catalog/components/rest.json  |   2 +-
 .../apache/camel/catalog/components/resteasy.json  |   2 +-
 .../camel/catalog/components/robotframework.json   |   2 +-
 .../org/apache/camel/catalog/components/rss.json   |   2 +-
 .../org/apache/camel/catalog/components/saga.json  |   2 +-
 .../camel/catalog/components/salesforce.json       |   2 +-
 .../camel/catalog/components/sap-netweaver.json    |   2 +-
 .../apache/camel/catalog/components/scheduler.json |   2 +-
 .../camel/catalog/components/schematron.json       |   2 +-
 .../org/apache/camel/catalog/components/scp.json   |   2 +-
 .../org/apache/camel/catalog/components/seda.json  |   2 +-
 .../apache/camel/catalog/components/service.json   |   2 +-
 .../camel/catalog/components/servicenow.json       |   2 +-
 .../apache/camel/catalog/components/servlet.json   |   2 +-
 .../org/apache/camel/catalog/components/sftp.json  |   2 +-
 .../org/apache/camel/catalog/components/sjms.json  |   2 +-
 .../org/apache/camel/catalog/components/sjms2.json |   2 +-
 .../org/apache/camel/catalog/components/slack.json |   2 +-
 .../org/apache/camel/catalog/components/smpp.json  |   2 +-
 .../org/apache/camel/catalog/components/smpps.json |   2 +-
 .../org/apache/camel/catalog/components/smtp.json  |   2 +-
 .../org/apache/camel/catalog/components/smtps.json |   2 +-
 .../org/apache/camel/catalog/components/snmp.json  |   2 +-
 .../org/apache/camel/catalog/components/solr.json  |   2 +-
 .../apache/camel/catalog/components/solrCloud.json |   2 +-
 .../org/apache/camel/catalog/components/solrs.json |   2 +-
 .../org/apache/camel/catalog/components/spark.json |   2 +-
 .../camel/catalog/components/splunk-hec.json       |   2 +-
 .../apache/camel/catalog/components/splunk.json    |   2 +-
 .../camel/catalog/components/spring-batch.json     |   2 +-
 .../camel/catalog/components/spring-event.json     |   2 +-
 .../catalog/components/spring-integration.json     |   2 +-
 .../camel/catalog/components/spring-jdbc.json      |   2 +-
 .../camel/catalog/components/spring-ldap.json      |   2 +-
 .../camel/catalog/components/spring-rabbitmq.json  |   2 +-
 .../camel/catalog/components/spring-redis.json     |   2 +-
 .../apache/camel/catalog/components/spring-ws.json |   2 +-
 .../camel/catalog/components/sql-stored.json       |   2 +-
 .../org/apache/camel/catalog/components/sql.json   |   2 +-
 .../org/apache/camel/catalog/components/ssh.json   |   2 +-
 .../org/apache/camel/catalog/components/stax.json  |   2 +-
 .../apache/camel/catalog/components/stitch.json    |   2 +-
 .../org/apache/camel/catalog/components/stomp.json |   2 +-
 .../apache/camel/catalog/components/stream.json    |   2 +-
 .../camel/catalog/components/string-template.json  |   2 +-
 .../org/apache/camel/catalog/components/stub.json  |   2 +-
 .../apache/camel/catalog/components/telegram.json  |   2 +-
 .../apache/camel/catalog/components/thrift.json    |   2 +-
 .../org/apache/camel/catalog/components/tika.json  |   2 +-
 .../org/apache/camel/catalog/components/timer.json |   2 +-
 .../apache/camel/catalog/components/twilio.json    |   2 +-
 .../catalog/components/twitter-directmessage.json  |   2 +-
 .../camel/catalog/components/twitter-search.json   |   2 +-
 .../camel/catalog/components/twitter-timeline.json |   2 +-
 .../apache/camel/catalog/components/undertow.json  |   2 +-
 .../apache/camel/catalog/components/validator.json |   2 +-
 .../apache/camel/catalog/components/velocity.json  |   2 +-
 .../camel/catalog/components/vertx-http.json       |   2 +-
 .../camel/catalog/components/vertx-kafka.json      |   2 +-
 .../camel/catalog/components/vertx-websocket.json  |   2 +-
 .../org/apache/camel/catalog/components/vertx.json |   2 +-
 .../org/apache/camel/catalog/components/vm.json    |   2 +-
 .../apache/camel/catalog/components/weather.json   |   2 +-
 .../org/apache/camel/catalog/components/web3j.json |   2 +-
 .../apache/camel/catalog/components/webhook.json   |   2 +-
 .../camel/catalog/components/websocket-jsr356.json |   2 +-
 .../apache/camel/catalog/components/websocket.json |   2 +-
 .../org/apache/camel/catalog/components/weka.json  |   2 +-
 .../apache/camel/catalog/components/whatsapp.json  |   2 +-
 .../apache/camel/catalog/components/wordpress.json |   2 +-
 .../apache/camel/catalog/components/workday.json   |   2 +-
 .../apache/camel/catalog/components/xchange.json   |   2 +-
 .../org/apache/camel/catalog/components/xj.json    |   2 +-
 .../camel/catalog/components/xmlsecurity-sign.json |   2 +-
 .../catalog/components/xmlsecurity-verify.json     |   2 +-
 .../org/apache/camel/catalog/components/xmpp.json  |   2 +-
 .../apache/camel/catalog/components/xquery.json    |   2 +-
 .../camel/catalog/components/xslt-saxon.json       |   2 +-
 .../org/apache/camel/catalog/components/xslt.json  |   2 +-
 .../apache/camel/catalog/components/zendesk.json   |   2 +-
 .../camel/catalog/components/zookeeper-master.json |   2 +-
 .../apache/camel/catalog/components/zookeeper.json |   2 +-
 .../apache/camel/catalog/dataformats/any23.json    |   2 +-
 .../org/apache/camel/catalog/dataformats/asn1.json |   2 +-
 .../org/apache/camel/catalog/dataformats/avro.json |   2 +-
 .../camel/catalog/dataformats/avroJackson.json     |   2 +-
 .../apache/camel/catalog/dataformats/barcode.json  |   2 +-
 .../apache/camel/catalog/dataformats/base64.json   |   2 +-
 .../apache/camel/catalog/dataformats/bindyCsv.json |   2 +-
 .../camel/catalog/dataformats/bindyFixed.json      |   2 +-
 .../apache/camel/catalog/dataformats/bindyKvp.json |   2 +-
 .../org/apache/camel/catalog/dataformats/cbor.json |   2 +-
 .../apache/camel/catalog/dataformats/crypto.json   |   2 +-
 .../org/apache/camel/catalog/dataformats/csv.json  |   2 +-
 .../apache/camel/catalog/dataformats/fastjson.json |   2 +-
 .../apache/camel/catalog/dataformats/fhirJson.json |   2 +-
 .../apache/camel/catalog/dataformats/fhirXml.json  |   2 +-
 .../apache/camel/catalog/dataformats/flatpack.json |   2 +-
 .../org/apache/camel/catalog/dataformats/grok.json |   2 +-
 .../org/apache/camel/catalog/dataformats/gson.json |   2 +-
 .../camel/catalog/dataformats/gzipDeflater.json    |   2 +-
 .../org/apache/camel/catalog/dataformats/hl7.json  |   2 +-
 .../org/apache/camel/catalog/dataformats/ical.json |   2 +-
 .../apache/camel/catalog/dataformats/jackson.json  |   2 +-
 .../camel/catalog/dataformats/jacksonXml.json      |   2 +-
 .../org/apache/camel/catalog/dataformats/jaxb.json |   2 +-
 .../apache/camel/catalog/dataformats/johnzon.json  |   2 +-
 .../apache/camel/catalog/dataformats/jsonApi.json  |   2 +-
 .../apache/camel/catalog/dataformats/jsonb.json    |   2 +-
 .../org/apache/camel/catalog/dataformats/lzf.json  |   2 +-
 .../camel/catalog/dataformats/mimeMultipart.json   |   2 +-
 .../org/apache/camel/catalog/dataformats/pgp.json  |   2 +-
 .../apache/camel/catalog/dataformats/protobuf.json |   2 +-
 .../camel/catalog/dataformats/protobufJackson.json |   2 +-
 .../org/apache/camel/catalog/dataformats/rss.json  |   2 +-
 .../camel/catalog/dataformats/snakeYaml.json       |   2 +-
 .../org/apache/camel/catalog/dataformats/soap.json |   2 +-
 .../apache/camel/catalog/dataformats/swiftMt.json  |   2 +-
 .../apache/camel/catalog/dataformats/swiftMx.json  |   2 +-
 .../apache/camel/catalog/dataformats/syslog.json   |   2 +-
 .../apache/camel/catalog/dataformats/tarFile.json  |   2 +-
 .../apache/camel/catalog/dataformats/thrift.json   |   2 +-
 .../camel/catalog/dataformats/univocityCsv.json    |   2 +-
 .../camel/catalog/dataformats/univocityFixed.json  |   2 +-
 .../camel/catalog/dataformats/univocityTsv.json    |   2 +-
 .../camel/catalog/dataformats/xmlSecurity.json     |   2 +-
 .../apache/camel/catalog/dataformats/xstream.json  |   2 +-
 .../camel/catalog/dataformats/xstreamJson.json     |   2 +-
 .../camel/catalog/dataformats/zipDeflater.json     |   2 +-
 .../apache/camel/catalog/dataformats/zipFile.json  |   2 +-
 .../org/apache/camel/catalog/languages/bean.json   |   2 +-
 .../apache/camel/catalog/languages/constant.json   |   2 +-
 .../apache/camel/catalog/languages/csimple.json    |   2 +-
 .../apache/camel/catalog/languages/datasonnet.json |   2 +-
 .../camel/catalog/languages/exchangeProperty.json  |   2 +-
 .../org/apache/camel/catalog/languages/file.json   |   2 +-
 .../org/apache/camel/catalog/languages/groovy.json |   2 +-
 .../org/apache/camel/catalog/languages/header.json |   2 +-
 .../apache/camel/catalog/languages/hl7terser.json  |   2 +-
 .../org/apache/camel/catalog/languages/joor.json   |   2 +-
 .../org/apache/camel/catalog/languages/jq.json     |   2 +-
 .../org/apache/camel/catalog/languages/js.json     |   2 +-
 .../apache/camel/catalog/languages/jsonpath.json   |   2 +-
 .../org/apache/camel/catalog/languages/mvel.json   |   2 +-
 .../org/apache/camel/catalog/languages/ognl.json   |   2 +-
 .../org/apache/camel/catalog/languages/python.json |   2 +-
 .../org/apache/camel/catalog/languages/ref.json    |   2 +-
 .../org/apache/camel/catalog/languages/simple.json |   2 +-
 .../org/apache/camel/catalog/languages/spel.json   |   2 +-
 .../apache/camel/catalog/languages/tokenize.json   |   2 +-
 .../org/apache/camel/catalog/languages/xpath.json  |   2 +-
 .../org/apache/camel/catalog/languages/xquery.json |   2 +-
 .../apache/camel/catalog/languages/xtokenize.json  |   2 +-
 .../apache/camel/catalog/others/attachments.json   |   2 +-
 .../org/apache/camel/catalog/others/aws-xray.json  |   2 +-
 .../camel/catalog/others/caffeine-lrucache.json    |   2 +-
 .../org/apache/camel/catalog/others/cdi-jta.json   |   2 +-
 .../org/apache/camel/catalog/others/cdi-main.json  |   2 +-
 .../org/apache/camel/catalog/others/cdi.json       |   2 +-
 .../apache/camel/catalog/others/cli-connector.json |   2 +-
 .../org/apache/camel/catalog/others/cloud.json     |   2 +-
 .../apache/camel/catalog/others/cloudevents.json   |   2 +-
 .../org/apache/camel/catalog/others/cluster.json   |   2 +-
 .../apache/camel/catalog/others/componentdsl.json  |   2 +-
 .../org/apache/camel/catalog/others/console.json   |   2 +-
 .../apache/camel/catalog/others/csimple-joor.json  |   2 +-
 .../org/apache/camel/catalog/others/debug.json     |   2 +-
 .../apache/camel/catalog/others/dsl-modeline.json  |   2 +-
 .../apache/camel/catalog/others/dsl-support.json   |   2 +-
 .../org/apache/camel/catalog/others/elytron.json   |   2 +-
 .../apache/camel/catalog/others/endpointdsl.json   |   2 +-
 .../apache/camel/catalog/others/groovy-dsl.json    |   2 +-
 .../apache/camel/catalog/others/headersmap.json    |   2 +-
 .../org/apache/camel/catalog/others/health.json    |   2 +-
 .../org/apache/camel/catalog/others/jasypt.json    |   2 +-
 .../apache/camel/catalog/others/java-joor-dsl.json |   2 +-
 .../org/apache/camel/catalog/others/jfr.json       |   2 +-
 .../org/apache/camel/catalog/others/js-dsl.json    |   2 +-
 .../org/apache/camel/catalog/others/jsh-dsl.json   |   2 +-
 .../org/apache/camel/catalog/others/jta.json       |   2 +-
 .../apache/camel/catalog/others/kamelet-main.json  |   2 +-
 .../apache/camel/catalog/others/kotlin-dsl.json    |   2 +-
 .../org/apache/camel/catalog/others/leveldb.json   |   2 +-
 .../org/apache/camel/catalog/others/lra.json       |   2 +-
 .../camel/catalog/others/mail-microsoft-oauth.json |   2 +-
 .../org/apache/camel/catalog/others/main.json      |   2 +-
 .../apache/camel/catalog/others/management.json    |   2 +-
 .../camel/catalog/others/microprofile-config.json  |   2 +-
 .../others/microprofile-fault-tolerance.json       |   2 +-
 .../camel/catalog/others/microprofile-health.json  |   2 +-
 .../apache/camel/catalog/others/openapi-java.json  |   2 +-
 .../apache/camel/catalog/others/opentelemetry.json |   2 +-
 .../apache/camel/catalog/others/opentracing.json   |   2 +-
 .../camel/catalog/others/platform-http-vertx.json  |   2 +-
 .../catalog/others/reactive-executor-tomcat.json   |   2 +-
 .../catalog/others/reactive-executor-vertx.json    |   2 +-
 .../org/apache/camel/catalog/others/reactor.json   |   2 +-
 .../org/apache/camel/catalog/others/redis.json     |   2 +-
 .../apache/camel/catalog/others/resilience4j.json  |   2 +-
 .../catalog/others/resourceresolver-github.json    |   2 +-
 .../org/apache/camel/catalog/others/rxjava.json    |   2 +-
 .../org/apache/camel/catalog/others/shiro.json     |   2 +-
 .../apache/camel/catalog/others/spring-main.json   |   2 +-
 .../camel/catalog/others/spring-security.json      |   2 +-
 .../apache/camel/catalog/others/spring-xml.json    |   2 +-
 .../apache/camel/catalog/others/swagger-java.json  |   2 +-
 .../org/apache/camel/catalog/others/test-cdi.json  |   2 +-
 .../apache/camel/catalog/others/test-junit5.json   |   2 +-
 .../camel/catalog/others/test-spring-junit5.json   |   2 +-
 .../apache/camel/catalog/others/test-spring.json   |   2 +-
 .../catalog/others/threadpoolfactory-vertx.json    |   2 +-
 .../org/apache/camel/catalog/others/tracing.json   |   2 +-
 .../catalog/others/undertow-spring-security.json   |   2 +-
 .../org/apache/camel/catalog/others/wal.json       |   2 +-
 .../apache/camel/catalog/others/xml-io-dsl.json    |   2 +-
 .../apache/camel/catalog/others/xml-jaxb-dsl.json  |   2 +-
 .../org/apache/camel/catalog/others/yaml-dsl.json  |   2 +-
 .../org/apache/camel/catalog/others/zipkin.json    |   2 +-
 catalog/camel-csimple-maven-plugin/pom.xml         |   2 +-
 catalog/camel-report-maven-plugin/pom.xml          |   2 +-
 catalog/camel-route-parser/pom.xml                 |   2 +-
 catalog/dummy-component/pom.xml                    |   2 +-
 catalog/pom.xml                                    |   2 +-
 components/camel-activemq/pom.xml                  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/activemq/activemq.json  |   2 +-
 components/camel-amqp/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/amqp/amqp.json      |   2 +-
 components/camel-any23/pom.xml                     |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../org/apache/camel/dataformat/any23/any23.json   |   2 +-
 components/camel-arangodb/pom.xml                  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/arangodb/arangodb.json  |   2 +-
 components/camel-as2/camel-as2-api/pom.xml         |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/as2-api.json           |   2 +-
 components/camel-as2/camel-as2-component/pom.xml   |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/as2/as2.json        |   2 +-
 components/camel-as2/pom.xml                       |   2 +-
 components/camel-asn1/pom.xml                      |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../org/apache/camel/dataformat/asn1/asn1.json     |   2 +-
 components/camel-asterisk/pom.xml                  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/asterisk/asterisk.json  |   2 +-
 components/camel-atlasmap/pom.xml                  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/atlasmap/atlasmap.json  |   2 +-
 components/camel-atmos/pom.xml                     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/atmos/atmos.json    |   2 +-
 components/camel-atmosphere-websocket/pom.xml      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../atmosphere/websocket/atmosphere-websocket.json |   2 +-
 components/camel-atom/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/atom/atom.json      |   2 +-
 components/camel-attachments/pom.xml               |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/attachments.json       |   2 +-
 .../camel-avro-rpc-component/pom.xml               |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/avro/avro.json      |   2 +-
 .../camel-avro-rpc/camel-avro-rpc-jetty/pom.xml    |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/avro-rpc-jetty.json    |   2 +-
 .../camel-avro-rpc/camel-avro-rpc-spi/pom.xml      |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/avro-rpc-spi.json      |   2 +-
 components/camel-avro-rpc/pom.xml                  |   2 +-
 components/camel-avro/pom.xml                      |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../org/apache/camel/dataformat/avro/avro.json     |   2 +-
 components/camel-aws/camel-aws-cloudtrail/pom.xml  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/aws/cloudtrail/aws-cloudtrail.json   |   2 +-
 .../camel-aws/camel-aws-secrets-manager/pom.xml    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../aws/secretsmanager/aws-secrets-manager.json    |   2 +-
 components/camel-aws/camel-aws-xray/pom.xml        |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/aws-xray.json          |   2 +-
 components/camel-aws/camel-aws2-athena/pom.xml     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/aws2/athena/aws2-athena.json   |   2 +-
 components/camel-aws/camel-aws2-cw/pom.xml         |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/aws2/cw/aws2-cw.json    |   2 +-
 components/camel-aws/camel-aws2-ddb/pom.xml        |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/aws2/ddb/aws2-ddb.json  |   2 +-
 .../component/aws2/ddbstream/aws2-ddbstream.json   |   2 +-
 components/camel-aws/camel-aws2-ec2/pom.xml        |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/aws2/ec2/aws2-ec2.json  |   2 +-
 components/camel-aws/camel-aws2-ecs/pom.xml        |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/aws2/ecs/aws2-ecs.json  |   2 +-
 components/camel-aws/camel-aws2-eks/pom.xml        |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/aws2/eks/aws2-eks.json  |   2 +-
 .../camel-aws/camel-aws2-eventbridge/pom.xml       |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../aws2/eventbridge/aws2-eventbridge.json         |   2 +-
 components/camel-aws/camel-aws2-iam/pom.xml        |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/aws2/iam/aws2-iam.json  |   2 +-
 components/camel-aws/camel-aws2-kinesis/pom.xml    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../aws2/firehose/aws2-kinesis-firehose.json       |   2 +-
 .../camel/component/aws2/kinesis/aws2-kinesis.json |   2 +-
 components/camel-aws/camel-aws2-kms/pom.xml        |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/aws2/kms/aws2-kms.json  |   2 +-
 components/camel-aws/camel-aws2-lambda/pom.xml     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/aws2/lambda/aws2-lambda.json   |   2 +-
 components/camel-aws/camel-aws2-mq/pom.xml         |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/aws2/mq/aws2-mq.json    |   2 +-
 components/camel-aws/camel-aws2-msk/pom.xml        |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/aws2/msk/aws2-msk.json  |   2 +-
 components/camel-aws/camel-aws2-s3/pom.xml         |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/aws2/s3/aws2-s3.json    |   2 +-
 components/camel-aws/camel-aws2-ses/pom.xml        |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/aws2/ses/aws2-ses.json  |   2 +-
 components/camel-aws/camel-aws2-sns/pom.xml        |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/aws2/sns/aws2-sns.json  |   2 +-
 components/camel-aws/camel-aws2-sqs/pom.xml        |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/aws2/sqs/aws2-sqs.json  |   2 +-
 components/camel-aws/camel-aws2-sts/pom.xml        |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/aws2/sts/aws2-sts.json  |   2 +-
 components/camel-aws/camel-aws2-translate/pom.xml  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/aws2/translate/aws2-translate.json   |   2 +-
 components/camel-aws/pom.xml                       |   2 +-
 .../camel-azure/camel-azure-cosmosdb/pom.xml       |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/azure/cosmosdb/azure-cosmosdb.json   |   2 +-
 .../camel-azure/camel-azure-eventhubs/pom.xml      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/azure/eventhubs/azure-eventhubs.json |   2 +-
 .../camel-azure/camel-azure-key-vault/pom.xml      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/azure/key/vault/azure-key-vault.json |   2 +-
 .../camel-azure/camel-azure-servicebus/pom.xml     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../azure/servicebus/azure-servicebus.json         |   2 +-
 .../camel-azure/camel-azure-storage-blob/pom.xml   |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../azure/storage/blob/azure-storage-blob.json     |   2 +-
 .../camel-azure-storage-datalake/pom.xml           |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../storage/datalake/azure-storage-datalake.json   |   2 +-
 .../camel-azure/camel-azure-storage-queue/pom.xml  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../azure/storage/queue/azure-storage-queue.json   |   2 +-
 components/camel-azure/pom.xml                     |   2 +-
 components/camel-barcode/pom.xml                   |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../apache/camel/dataformat/barcode/barcode.json   |   2 +-
 components/camel-base64/pom.xml                    |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../org/apache/camel/dataformat/base64/base64.json |   2 +-
 components/camel-bean-validator/pom.xml            |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/bean/validator/bean-validator.json   |   2 +-
 components/camel-bean/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../services/org/apache/camel/language.properties  |   2 +-
 .../org/apache/camel/component/bean/bean.json      |   2 +-
 .../apache/camel/component/beanclass/class.json    |   2 +-
 .../org/apache/camel/language/bean/bean.json       |   2 +-
 components/camel-bindy/pom.xml                     |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../camel/dataformat/bindy/csv/bindyCsv.json       |   2 +-
 .../camel/dataformat/bindy/fixed/bindyFixed.json   |   2 +-
 .../camel/dataformat/bindy/kvp/bindyKvp.json       |   2 +-
 components/camel-bonita/pom.xml                    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/bonita/bonita.json  |   2 +-
 components/camel-box/camel-box-api/pom.xml         |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/box-api.json           |   2 +-
 components/camel-box/camel-box-component/pom.xml   |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/box/box.json        |   2 +-
 components/camel-box/pom.xml                       |   2 +-
 components/camel-braintree/pom.xml                 |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/braintree/braintree.json       |   2 +-
 components/camel-browse/pom.xml                    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/browse/browse.json  |   2 +-
 components/camel-caffeine-lrucache/pom.xml         |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/caffeine-lrucache.json |   2 +-
 components/camel-caffeine/pom.xml                  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/caffeine/cache/caffeine-cache.json   |   2 +-
 .../caffeine/load/caffeine-loadcache.json          |   2 +-
 components/camel-cassandraql/pom.xml               |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/cassandra/cql.json  |   2 +-
 components/camel-cbor/pom.xml                      |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../org/apache/camel/component/cbor/cbor.json      |   2 +-
 components/camel-cdi-jta/pom.xml                   |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/cdi-jta.json           |   2 +-
 components/camel-cdi-main/pom.xml                  |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/cdi-main.json          |   2 +-
 components/camel-cdi/pom.xml                       |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../camel-cdi/src/generated/resources/cdi.json     |   2 +-
 components/camel-chatscript/pom.xml                |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/chatscript/chatscript.json     |   2 +-
 components/camel-chunk/pom.xml                     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/chunk/chunk.json    |   2 +-
 components/camel-cloudevents/pom.xml               |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/cloudevents.json       |   2 +-
 components/camel-cm-sms/pom.xml                    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/cm/cm-sms.json      |   2 +-
 components/camel-cmis/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/cmis/cmis.json      |   2 +-
 components/camel-coap/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../resources/org/apache/camel/coap/coap+tcp.json  |   2 +-
 .../resources/org/apache/camel/coap/coap.json      |   2 +-
 .../resources/org/apache/camel/coap/coaps+tcp.json |   2 +-
 .../resources/org/apache/camel/coap/coaps.json     |   2 +-
 components/camel-cometd/pom.xml                    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/cometd/cometd.json  |   2 +-
 .../org/apache/camel/component/cometd/cometds.json |   2 +-
 components/camel-consul/pom.xml                    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/consul/consul.json  |   2 +-
 components/camel-controlbus/pom.xml                |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/controlbus/controlbus.json     |   2 +-
 components/camel-corda/pom.xml                     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/corda/corda.json    |   2 +-
 components/camel-couchbase/pom.xml                 |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/couchbase/couchbase.json       |   2 +-
 components/camel-couchdb/pom.xml                   |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/couchdb/couchdb.json    |   2 +-
 components/camel-cron/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/cron/cron.json      |   2 +-
 components/camel-crypto/pom.xml                    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../org/apache/camel/component/crypto/crypto.json  |   2 +-
 .../org/apache/camel/converter/crypto/crypto.json  |   2 +-
 .../org/apache/camel/converter/crypto/pgp.json     |   2 +-
 components/camel-csimple-joor/pom.xml              |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/csimple-joor.json      |   2 +-
 components/camel-csv/pom.xml                       |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../org/apache/camel/dataformat/csv/csv.json       |   2 +-
 components/camel-cxf/camel-cxf-common/pom.xml      |   2 +-
 components/camel-cxf/camel-cxf-rest/pom.xml        |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/cxf/jaxrs/cxfrs.json    |   2 +-
 components/camel-cxf/camel-cxf-soap/pom.xml        |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/cxf/jaxws/cxf.json  |   2 +-
 .../camel-cxf/camel-cxf-spring-common/pom.xml      |   2 +-
 components/camel-cxf/camel-cxf-spring-rest/pom.xml |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/cxf-spring-rest.json   |   2 +-
 components/camel-cxf/camel-cxf-spring-soap/pom.xml |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/cxf-spring-soap.json   |   2 +-
 .../camel-cxf/camel-cxf-spring-transport/pom.xml   |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../generated/resources/cxf-spring-transport.json  |   2 +-
 components/camel-cxf/camel-cxf-transport/pom.xml   |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/cxf-transport.json     |   2 +-
 components/camel-cxf/pom.xml                       |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 components/camel-dataformat/pom.xml                |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/dataformat/dataformat.json     |   2 +-
 components/camel-dataset/pom.xml                   |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/dataset/dataset-test.json      |   2 +-
 .../apache/camel/component/dataset/dataset.json    |   2 +-
 components/camel-datasonnet/pom.xml                |   2 +-
 .../services/org/apache/camel/language.properties  |   2 +-
 .../camel/language/datasonnet/datasonnet.json      |   2 +-
 .../camel-debezium-common-component/pom.xml        |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/debezium-common.json   |   2 +-
 .../camel-debezium-maven-plugin/pom.xml            |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../generated/resources/debezium-maven-plugin.json |   2 +-
 .../camel-debezium/camel-debezium-common/pom.xml   |   2 +-
 .../camel-debezium/camel-debezium-db2/pom.xml      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/debezium/debezium-db2.json     |   2 +-
 .../camel-debezium/camel-debezium-mongodb/pom.xml  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/debezium/debezium-mongodb.json |   2 +-
 .../camel-debezium/camel-debezium-mysql/pom.xml    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/debezium/debezium-mysql.json   |   2 +-
 .../camel-debezium/camel-debezium-oracle/pom.xml   |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/debezium/debezium-oracle.json  |   2 +-
 .../camel-debezium/camel-debezium-postgres/pom.xml |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/debezium/debezium-postgres.json      |   2 +-
 .../camel-debezium-sqlserver/pom.xml               |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/debezium/debezium-sqlserver.json     |   2 +-
 components/camel-debezium/pom.xml                  |   2 +-
 components/camel-debug/pom.xml                     |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../camel-debug/src/generated/resources/debug.json |   2 +-
 components/camel-digitalocean/pom.xml              |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/digitalocean/digitalocean.json |   2 +-
 components/camel-direct/pom.xml                    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/direct/direct.json  |   2 +-
 components/camel-directvm/pom.xml                  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/directvm/direct-vm.json |   2 +-
 components/camel-disruptor/pom.xml                 |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/disruptor/disruptor-vm.json    |   2 +-
 .../camel/component/disruptor/disruptor.json       |   2 +-
 components/camel-djl/pom.xml                       |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/djl/djl.json        |   2 +-
 components/camel-dns/pom.xml                       |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/dns/dns.json        |   2 +-
 components/camel-docker/pom.xml                    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/docker/docker.json  |   2 +-
 components/camel-dozer/pom.xml                     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/dozer/dozer.json    |   2 +-
 components/camel-drill/pom.xml                     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/drill/drill.json    |   2 +-
 components/camel-dropbox/pom.xml                   |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/dropbox/dropbox.json    |   2 +-
 components/camel-dynamic-router/pom.xml            |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/dynamicrouter/dynamic-router.json    |   2 +-
 components/camel-ehcache/pom.xml                   |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/ehcache/ehcache.json    |   2 +-
 components/camel-elasticsearch-rest/pom.xml        |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../elasticsearch/elasticsearch-rest.json          |   2 +-
 components/camel-elasticsearch/pom.xml             |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/es/elasticsearch.json   |   2 +-
 components/camel-elytron/pom.xml                   |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/elytron.json           |   2 +-
 components/camel-etcd3/pom.xml                     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/etcd3/etcd3.json    |   2 +-
 components/camel-exec/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/exec/exec.json      |   2 +-
 components/camel-facebook/pom.xml                  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/facebook/facebook.json  |   2 +-
 components/camel-fastjson/pom.xml                  |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../apache/camel/component/fastjson/fastjson.json  |   2 +-
 components/camel-fhir/camel-fhir-api/pom.xml       |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/fhir-api.json          |   2 +-
 components/camel-fhir/camel-fhir-component/pom.xml |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../org/apache/camel/component/fhir/fhir.json      |   2 +-
 .../org/apache/camel/component/fhir/fhirJson.json  |   2 +-
 .../org/apache/camel/component/fhir/fhirXml.json   |   2 +-
 components/camel-fhir/pom.xml                      |   2 +-
 components/camel-file-watch/pom.xml                |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/file/watch/file-watch.json     |   2 +-
 components/camel-file/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/file/file.json      |   2 +-
 components/camel-flatpack/pom.xml                  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../apache/camel/component/flatpack/flatpack.json  |   2 +-
 .../apache/camel/dataformat/flatpack/flatpack.json |   2 +-
 components/camel-flink/pom.xml                     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/flink/flink.json    |   2 +-
 components/camel-fop/pom.xml                       |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/fop/fop.json        |   2 +-
 components/camel-freemarker/pom.xml                |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/freemarker/freemarker.json     |   2 +-
 components/camel-ftp/pom.xml                       |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/file/remote/ftp.json    |   2 +-
 .../apache/camel/component/file/remote/ftps.json   |   2 +-
 .../apache/camel/component/file/remote/sftp.json   |   2 +-
 components/camel-geocoder/pom.xml                  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/geocoder/geocoder.json  |   2 +-
 components/camel-git/pom.xml                       |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/git/git.json        |   2 +-
 components/camel-github/pom.xml                    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/github/github.json  |   2 +-
 .../camel-google/camel-google-bigquery/pom.xml     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/google/bigquery/google-bigquery.json |   2 +-
 .../google/bigquery/sql/google-bigquery-sql.json   |   2 +-
 .../camel-google/camel-google-calendar/pom.xml     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/google/calendar/google-calendar.json |   2 +-
 .../calendar/stream/google-calendar-stream.json    |   2 +-
 components/camel-google/camel-google-drive/pom.xml |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/google/drive/google-drive.json |   2 +-
 .../camel-google/camel-google-functions/pom.xml    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../google/functions/google-functions.json         |   2 +-
 components/camel-google/camel-google-mail/pom.xml  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/google/mail/google-mail.json   |   2 +-
 .../google/mail/stream/google-mail-stream.json     |   2 +-
 .../camel-google/camel-google-pubsub/pom.xml       |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/google/pubsub/google-pubsub.json     |   2 +-
 .../camel-google-secret-manager/pom.xml            |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../secret/manager/google-secret-manager.json      |   2 +-
 .../camel-google/camel-google-sheets/pom.xml       |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/google/sheets/google-sheets.json     |   2 +-
 .../google/sheets/stream/google-sheets-stream.json |   2 +-
 .../camel-google/camel-google-storage/pom.xml      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/google/storage/google-storage.json   |   2 +-
 components/camel-google/pom.xml                    |   2 +-
 components/camel-gora/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/gora/gora.json      |   2 +-
 components/camel-grape/pom.xml                     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/grape/grape.json    |   2 +-
 components/camel-graphql/pom.xml                   |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/graphql/graphql.json    |   2 +-
 components/camel-grok/pom.xml                      |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../org/apache/camel/component/grok/grok.json      |   2 +-
 components/camel-groovy/pom.xml                    |   2 +-
 .../services/org/apache/camel/language.properties  |   2 +-
 .../org/apache/camel/language/groovy/groovy.json   |   2 +-
 components/camel-grpc/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/grpc/grpc.json      |   2 +-
 components/camel-gson/pom.xml                      |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../org/apache/camel/component/gson/gson.json      |   2 +-
 components/camel-guava-eventbus/pom.xml            |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/guava/eventbus/guava-eventbus.json   |   2 +-
 components/camel-hashicorp-vault/pom.xml           |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/hashicorp/vault/hashicorp-vault.json |   2 +-
 components/camel-hazelcast/pom.xml                 |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../atomicnumber/hazelcast-atomicvalue.json        |   2 +-
 .../hazelcast/instance/hazelcast-instance.json     |   2 +-
 .../component/hazelcast/list/hazelcast-list.json   |   2 +-
 .../component/hazelcast/map/hazelcast-map.json     |   2 +-
 .../hazelcast/multimap/hazelcast-multimap.json     |   2 +-
 .../component/hazelcast/queue/hazelcast-queue.json |   2 +-
 .../replicatedmap/hazelcast-replicatedmap.json     |   2 +-
 .../hazelcast/ringbuffer/hazelcast-ringbuffer.json |   2 +-
 .../component/hazelcast/seda/hazelcast-seda.json   |   2 +-
 .../component/hazelcast/set/hazelcast-set.json     |   2 +-
 .../component/hazelcast/topic/hazelcast-topic.json |   2 +-
 components/camel-hbase/pom.xml                     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/hbase/hbase.json    |   2 +-
 components/camel-hdfs/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/hdfs/hdfs.json      |   2 +-
 components/camel-headersmap/pom.xml                |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/headersmap.json        |   2 +-
 components/camel-hl7/pom.xml                       |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../services/org/apache/camel/language.properties  |   2 +-
 .../org/apache/camel/component/hl7/hl7.json        |   2 +-
 .../org/apache/camel/component/hl7/hl7terser.json  |   2 +-
 components/camel-http-base/pom.xml                 |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/http-base.json         |   2 +-
 components/camel-http-common/pom.xml               |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/http-common.json       |   2 +-
 components/camel-http/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/http/http.json      |   2 +-
 .../org/apache/camel/component/http/https.json     |   2 +-
 .../camel-huawei/camel-huaweicloud-common/pom.xml  |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../generated/resources/huaweicloud-common.json    |   2 +-
 .../camel-huawei/camel-huaweicloud-dms/pom.xml     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/huaweicloud/dms/hwcloud-dms.json     |   2 +-
 .../camel-huawei/camel-huaweicloud-frs/pom.xml     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/huaweicloud/frs/hwcloud-frs.json     |   2 +-
 .../camel-huaweicloud-functiongraph/pom.xml        |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/hwcloud-functiongraph.json    |   2 +-
 .../camel-huawei/camel-huaweicloud-iam/pom.xml     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/huaweicloud/iam/hwcloud-iam.json     |   2 +-
 .../camel-huaweicloud-imagerecognition/pom.xml     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../image/hwcloud-imagerecognition.json            |   2 +-
 .../camel-huawei/camel-huaweicloud-obs/pom.xml     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/huaweicloud/obs/hwcloud-obs.json     |   2 +-
 .../camel-huawei/camel-huaweicloud-smn/pom.xml     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/huaweicloud/smn/hwcloud-smn.json     |   2 +-
 components/camel-huawei/pom.xml                    |   2 +-
 components/camel-hyperledger-aries/pom.xml         |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/aries/hyperledger-aries.json   |   2 +-
 components/camel-ical/pom.xml                      |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../org/apache/camel/component/ical/ical.json      |   2 +-
 components/camel-iec60870/pom.xml                  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/iec60870/client/iec60870-client.json |   2 +-
 .../component/iec60870/server/iec60870-server.json |   2 +-
 components/camel-ignite/pom.xml                    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/ignite/cache/ignite-cache.json |   2 +-
 .../component/ignite/compute/ignite-compute.json   |   2 +-
 .../component/ignite/events/ignite-events.json     |   2 +-
 .../camel/component/ignite/idgen/ignite-idgen.json |   2 +-
 .../ignite/messaging/ignite-messaging.json         |   2 +-
 .../camel/component/ignite/queue/ignite-queue.json |   2 +-
 .../camel/component/ignite/set/ignite-set.json     |   2 +-
 .../camel-infinispan-common/pom.xml                |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/infinispan-common.json |   2 +-
 .../camel-infinispan-embedded/pom.xml              |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../infinispan/embedded/infinispan-embedded.json   |   2 +-
 .../camel-infinispan/camel-infinispan/pom.xml      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/infinispan/remote/infinispan.json    |   2 +-
 components/camel-infinispan/pom.xml                |   2 +-
 components/camel-influxdb/pom.xml                  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/influxdb/influxdb.json  |   2 +-
 components/camel-iota/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/iota/iota.json      |   2 +-
 components/camel-ipfs/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/ipfs/ipfs.json      |   2 +-
 components/camel-irc/pom.xml                       |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/irc/irc.json        |   2 +-
 components/camel-ironmq/pom.xml                    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/ironmq/ironmq.json  |   2 +-
 components/camel-jackson-avro/pom.xml              |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../camel/component/jackson/avro/avroJackson.json  |   2 +-
 components/camel-jackson-protobuf/pom.xml          |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../jackson/protobuf/protobufJackson.json          |   2 +-
 components/camel-jackson/pom.xml                   |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../apache/camel/component/jackson/jackson.json    |   2 +-
 components/camel-jacksonxml/pom.xml                |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../camel/component/jacksonxml/jacksonXml.json     |   2 +-
 components/camel-jasypt/pom.xml                    |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/jasypt.json            |   2 +-
 components/camel-javascript/pom.xml                |   2 +-
 .../services/org/apache/camel/language.properties  |   2 +-
 .../resources/org/apache/camel/language/js/js.json |   2 +-
 components/camel-jaxb/pom.xml                      |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../org/apache/camel/converter/jaxb/jaxb.json      |   2 +-
 components/camel-jbpm/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/jbpm/jbpm.json      |   2 +-
 components/camel-jcache/pom.xml                    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/jcache/jcache.json  |   2 +-
 components/camel-jclouds/pom.xml                   |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/jclouds/jclouds.json    |   2 +-
 components/camel-jcr/pom.xml                       |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/jcr/jcr.json        |   2 +-
 components/camel-jdbc/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/jdbc/jdbc.json      |   2 +-
 components/camel-jetty-common/pom.xml              |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/jetty-common.json      |   2 +-
 components/camel-jetty/pom.xml                     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/jetty9/jetty.json   |   2 +-
 components/camel-jfr/pom.xml                       |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../camel-jfr/src/generated/resources/jfr.json     |   2 +-
 components/camel-jgroups-raft/pom.xml              |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/jgroups/raft/jgroups-raft.json |   2 +-
 components/camel-jgroups/pom.xml                   |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/jgroups/jgroups.json    |   2 +-
 components/camel-jira/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/jira/jira.json      |   2 +-
 components/camel-jms/pom.xml                       |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/jms/jms.json        |   2 +-
 components/camel-jmx/pom.xml                       |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/jmx/jmx.json        |   2 +-
 components/camel-johnzon/pom.xml                   |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../apache/camel/component/johnzon/johnzon.json    |   2 +-
 components/camel-jolt/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/jolt/jolt.json      |   2 +-
 components/camel-jooq/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/jooq/jooq.json      |   2 +-
 components/camel-joor/pom.xml                      |   2 +-
 .../services/org/apache/camel/language.properties  |   2 +-
 .../org/apache/camel/language/joor/joor.json       |   2 +-
 components/camel-jpa/pom.xml                       |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/jpa/jpa.json        |   2 +-
 components/camel-jq/pom.xml                        |   2 +-
 .../services/org/apache/camel/language.properties  |   2 +-
 .../resources/org/apache/camel/language/jq/jq.json |   2 +-
 components/camel-jsch/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/scp/scp.json        |   2 +-
 components/camel-jslt/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/jslt/jslt.json      |   2 +-
 components/camel-json-patch/pom.xml                |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/jsonpatch/json-patch.json      |   2 +-
 components/camel-json-validator/pom.xml            |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/jsonvalidator/json-validator.json    |   2 +-
 components/camel-jsonapi/pom.xml                   |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../apache/camel/component/jsonapi/jsonApi.json    |   2 +-
 components/camel-jsonata/pom.xml                   |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/jsonata/jsonata.json    |   2 +-
 components/camel-jsonb/pom.xml                     |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../org/apache/camel/component/jsonb/jsonb.json    |   2 +-
 components/camel-jsonpath/pom.xml                  |   2 +-
 .../services/org/apache/camel/language.properties  |   2 +-
 .../org/apache/camel/jsonpath/jsonpath.json        |   2 +-
 components/camel-jt400/pom.xml                     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/jt400/jt400.json    |   2 +-
 components/camel-jta/pom.xml                       |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../camel-jta/src/generated/resources/jta.json     |   2 +-
 components/camel-kafka/pom.xml                     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/kafka/kafka.json    |   2 +-
 components/camel-kamelet/pom.xml                   |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/kamelet/kamelet.json    |   2 +-
 components/camel-knative/camel-knative-api/pom.xml |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/knative-api.json       |   2 +-
 .../camel-knative/camel-knative-component/pom.xml  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/knative/knative.json    |   2 +-
 .../camel-knative/camel-knative-http/pom.xml       |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/knative-http.json      |   2 +-
 components/camel-knative/pom.xml                   |   2 +-
 components/camel-kubernetes/pom.xml                |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../config_maps/kubernetes-config-maps.json        |   2 +-
 .../kubernetes-custom-resources.json               |   2 +-
 .../deployments/kubernetes-deployments.json        |   2 +-
 .../kubernetes/events/kubernetes-events.json       |   2 +-
 .../component/kubernetes/hpa/kubernetes-hpa.json   |   2 +-
 .../component/kubernetes/job/kubernetes-job.json   |   2 +-
 .../namespaces/kubernetes-namespaces.json          |   2 +-
 .../kubernetes/nodes/kubernetes-nodes.json         |   2 +-
 .../kubernetes-persistent-volumes.json             |   2 +-
 .../kubernetes-persistent-volumes-claims.json      |   2 +-
 .../component/kubernetes/pods/kubernetes-pods.json |   2 +-
 .../kubernetes-replication-controllers.json        |   2 +-
 .../kubernetes-resources-quota.json                |   2 +-
 .../kubernetes/secrets/kubernetes-secrets.json     |   2 +-
 .../kubernetes-service-accounts.json               |   2 +-
 .../kubernetes/services/kubernetes-services.json   |   2 +-
 .../build_configs/openshift-build-configs.json     |   2 +-
 .../openshift/builds/openshift-builds.json         |   2 +-
 .../openshift-deploymentconfigs.json               |   2 +-
 components/camel-kudu/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/kudu/kudu.json      |   2 +-
 components/camel-language/pom.xml                  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/language/language.json  |   2 +-
 components/camel-ldap/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/ldap/ldap.json      |   2 +-
 components/camel-ldif/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/ldif/ldif.json      |   2 +-
 components/camel-leveldb/pom.xml                   |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/leveldb.json           |   2 +-
 components/camel-log/pom.xml                       |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/log/log.json        |   2 +-
 components/camel-lra/pom.xml                       |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../camel-lra/src/generated/resources/lra.json     |   2 +-
 components/camel-lucene/pom.xml                    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/lucene/lucene.json  |   2 +-
 components/camel-lumberjack/pom.xml                |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/lumberjack/lumberjack.json     |   2 +-
 components/camel-lzf/pom.xml                       |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../org/apache/camel/dataformat/lzf/lzf.json       |   2 +-
 components/camel-mail-microsoft-oauth/pom.xml      |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../generated/resources/mail-microsoft-oauth.json  |   2 +-
 components/camel-mail/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../org/apache/camel/component/mail/imap.json      |   2 +-
 .../org/apache/camel/component/mail/imaps.json     |   2 +-
 .../org/apache/camel/component/mail/pop3.json      |   2 +-
 .../org/apache/camel/component/mail/pop3s.json     |   2 +-
 .../org/apache/camel/component/mail/smtp.json      |   2 +-
 .../org/apache/camel/component/mail/smtps.json     |   2 +-
 .../dataformat/mime/multipart/mimeMultipart.json   |   2 +-
 components/camel-mapstruct/pom.xml                 |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/mapstruct/mapstruct.json       |   2 +-
 components/camel-master/pom.xml                    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/master/master.json  |   2 +-
 components/camel-metrics/pom.xml                   |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/metrics/metrics.json    |   2 +-
 components/camel-micrometer/pom.xml                |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/micrometer/micrometer.json     |   2 +-
 .../camel-microprofile-config/pom.xml              |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../generated/resources/microprofile-config.json   |   2 +-
 .../camel-microprofile-fault-tolerance/pom.xml     |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../resources/microprofile-fault-tolerance.json    |   2 +-
 .../camel-microprofile-health/pom.xml              |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../generated/resources/microprofile-health.json   |   2 +-
 .../camel-microprofile-metrics/pom.xml             |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../microprofile/metrics/microprofile-metrics.json |   2 +-
 components/camel-microprofile/pom.xml              |   2 +-
 components/camel-milo/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/milo/browse/milo-browse.json   |   2 +-
 .../camel/component/milo/client/milo-client.json   |   2 +-
 .../camel/component/milo/server/milo-server.json   |   2 +-
 components/camel-mina/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/mina/mina.json      |   2 +-
 components/camel-minio/pom.xml                     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/minio/minio.json    |   2 +-
 components/camel-mllp/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/mllp/mllp.json      |   2 +-
 components/camel-mock/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/mock/mock.json      |   2 +-
 components/camel-mongodb-gridfs/pom.xml            |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/mongodb/gridfs/mongodb-gridfs.json   |   2 +-
 components/camel-mongodb/pom.xml                   |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/mongodb/mongodb.json    |   2 +-
 components/camel-mustache/pom.xml                  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/mustache/mustache.json  |   2 +-
 components/camel-mvel/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../services/org/apache/camel/language.properties  |   2 +-
 .../org/apache/camel/component/mvel/mvel.json      |   2 +-
 .../org/apache/camel/language/mvel/mvel.json       |   2 +-
 components/camel-mybatis/pom.xml                   |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/mybatis/mybatis-bean.json      |   2 +-
 .../apache/camel/component/mybatis/mybatis.json    |   2 +-
 components/camel-nats/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/nats/nats.json      |   2 +-
 components/camel-netty-http/pom.xml                |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/netty/http/netty-http.json     |   2 +-
 components/camel-netty/pom.xml                     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/netty/netty.json    |   2 +-
 components/camel-nitrite/pom.xml                   |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/nitrite/nitrite.json    |   2 +-
 components/camel-oaipmh/pom.xml                    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/oaipmh/component/oaipmh.json  |   2 +-
 components/camel-ognl/pom.xml                      |   2 +-
 .../services/org/apache/camel/language.properties  |   2 +-
 .../org/apache/camel/language/ognl/ognl.json       |   2 +-
 components/camel-olingo2/camel-olingo2-api/pom.xml |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/olingo2-api.json       |   2 +-
 .../camel-olingo2/camel-olingo2-component/pom.xml  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/olingo2/olingo2.json    |   2 +-
 components/camel-olingo2/pom.xml                   |   2 +-
 components/camel-olingo4/camel-olingo4-api/pom.xml |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/olingo4-api.json       |   2 +-
 .../camel-olingo4/camel-olingo4-component/pom.xml  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/olingo4/olingo4.json    |   2 +-
 components/camel-olingo4/pom.xml                   |   2 +-
 components/camel-openapi-java/pom.xml              |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/openapi-java.json      |   2 +-
 components/camel-openstack/pom.xml                 |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../openstack/cinder/openstack-cinder.json         |   2 +-
 .../openstack/glance/openstack-glance.json         |   2 +-
 .../openstack/keystone/openstack-keystone.json     |   2 +-
 .../openstack/neutron/openstack-neutron.json       |   2 +-
 .../component/openstack/nova/openstack-nova.json   |   2 +-
 .../component/openstack/swift/openstack-swift.json |   2 +-
 components/camel-opentelemetry/pom.xml             |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/opentelemetry.json     |   2 +-
 components/camel-opentracing/pom.xml               |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/opentracing.json       |   2 +-
 components/camel-optaplanner/pom.xml               |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/optaplanner/optaplanner.json   |   2 +-
 components/camel-paho-mqtt5/pom.xml                |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/paho/mqtt5/paho-mqtt5.json     |   2 +-
 components/camel-paho/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/paho/paho.json      |   2 +-
 components/camel-pdf/pom.xml                       |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/pdf/pdf.json        |   2 +-
 components/camel-pg-replication-slot/pom.xml       |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../pg/replication/slot/pg-replication-slot.json   |   2 +-
 components/camel-pgevent/pom.xml                   |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/pgevent/pgevent.json    |   2 +-
 components/camel-platform-http-vertx/pom.xml       |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../generated/resources/platform-http-vertx.json   |   2 +-
 components/camel-platform-http/pom.xml             |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/platform/http/platform-http.json     |   2 +-
 components/camel-plc4x/pom.xml                     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/plc4x/plc4x.json    |   2 +-
 components/camel-printer/pom.xml                   |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/printer/lpr.json    |   2 +-
 components/camel-protobuf/pom.xml                  |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../apache/camel/dataformat/protobuf/protobuf.json |   2 +-
 components/camel-pubnub/pom.xml                    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/pubnub/pubnub.json  |   2 +-
 components/camel-pulsar/pom.xml                    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/pulsar/pulsar.json  |   2 +-
 components/camel-python/pom.xml                    |   2 +-
 .../services/org/apache/camel/language.properties  |   2 +-
 .../org/apache/camel/language/python/python.json   |   2 +-
 components/camel-quartz/pom.xml                    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/quartz/quartz.json  |   2 +-
 components/camel-quickfix/pom.xml                  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/quickfixj/quickfix.json |   2 +-
 components/camel-rabbitmq/pom.xml                  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/rabbitmq/rabbitmq.json  |   2 +-
 components/camel-reactive-executor-tomcat/pom.xml  |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../resources/reactive-executor-tomcat.json        |   2 +-
 components/camel-reactive-executor-vertx/pom.xml   |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../resources/reactive-executor-vertx.json         |   2 +-
 components/camel-reactive-streams/pom.xml          |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../reactive/streams/reactive-streams.json         |   2 +-
 components/camel-reactor/pom.xml                   |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/reactor.json           |   2 +-
 components/camel-redis/pom.xml                     |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../camel-redis/src/generated/resources/redis.json |   2 +-
 components/camel-ref/pom.xml                       |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/ref/ref.json        |   2 +-
 components/camel-resilience4j/pom.xml              |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/resilience4j.json      |   2 +-
 components/camel-resourceresolver-github/pom.xml   |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../resources/resourceresolver-github.json         |   2 +-
 components/camel-rest-openapi/pom.xml              |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/rest/openapi/rest-openapi.json |   2 +-
 components/camel-rest-swagger/pom.xml              |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/rest/swagger/rest-swagger.json |   2 +-
 components/camel-rest/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/rest/rest-api.json  |   2 +-
 .../org/apache/camel/component/rest/rest.json      |   2 +-
 components/camel-resteasy/pom.xml                  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/resteasy/resteasy.json  |   2 +-
 components/camel-robotframework/pom.xml            |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/robotframework/robotframework.json   |   2 +-
 components/camel-rss/pom.xml                       |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../org/apache/camel/component/rss/rss.json        |   2 +-
 .../org/apache/camel/dataformat/rss/rss.json       |   2 +-
 components/camel-rxjava/pom.xml                    |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/rxjava.json            |   2 +-
 components/camel-saga/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/saga/saga.json      |   2 +-
 .../camel-salesforce-codegen/pom.xml               |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../generated/resources/salesforce-codegen.json    |   2 +-
 .../camel-salesforce-component/pom.xml             |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/salesforce/salesforce.json     |   2 +-
 .../camel-salesforce-maven-plugin/pom.xml          |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../resources/salesforce-maven-plugin.json         |   2 +-
 components/camel-salesforce/pom.xml                |   2 +-
 components/camel-sap-netweaver/pom.xml             |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/sap/netweaver/sap-netweaver.json     |   2 +-
 components/camel-saxon/pom.xml                     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../services/org/apache/camel/language.properties  |   2 +-
 .../org/apache/camel/component/xquery/xquery.json  |   2 +-
 .../org/apache/camel/language/xquery/xquery.json   |   2 +-
 components/camel-scheduler/pom.xml                 |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/scheduler/scheduler.json       |   2 +-
 components/camel-schematron/pom.xml                |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/schematron/schematron.json     |   2 +-
 components/camel-seda/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/seda/seda.json      |   2 +-
 components/camel-service/pom.xml                   |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/service/service.json    |   2 +-
 .../camel-servicenow-component/pom.xml             |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/servicenow/servicenow.json     |   2 +-
 .../camel-servicenow-maven-plugin/pom.xml          |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../resources/servicenow-maven-plugin.json         |   2 +-
 components/camel-servicenow/pom.xml                |   2 +-
 components/camel-servlet/pom.xml                   |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/servlet/servlet.json    |   2 +-
 components/camel-shiro/pom.xml                     |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../camel-shiro/src/generated/resources/shiro.json |   2 +-
 components/camel-sjms/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/sjms/sjms.json      |   2 +-
 components/camel-sjms2/pom.xml                     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/sjms2/sjms2.json    |   2 +-
 components/camel-slack/pom.xml                     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/slack/slack.json    |   2 +-
 components/camel-smpp/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/smpp/smpp.json      |   2 +-
 .../org/apache/camel/component/smpp/smpps.json     |   2 +-
 components/camel-snakeyaml/pom.xml                 |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../camel/component/snakeyaml/snakeYaml.json       |   2 +-
 components/camel-snmp/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/snmp/snmp.json      |   2 +-
 components/camel-soap/pom.xml                      |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../org/apache/camel/dataformat/soap/soap.json     |   2 +-
 components/camel-solr/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/solr/solr.json      |   2 +-
 .../org/apache/camel/component/solr/solrCloud.json |   2 +-
 .../org/apache/camel/component/solr/solrs.json     |   2 +-
 components/camel-spark/pom.xml                     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/spark/spark.json    |   2 +-
 components/camel-splunk-hec/pom.xml                |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/splunkhec/splunk-hec.json      |   2 +-
 components/camel-splunk/pom.xml                    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/splunk/splunk.json  |   2 +-
 components/camel-spring-batch/pom.xml              |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/spring/batch/spring-batch.json |   2 +-
 components/camel-spring-integration/pom.xml        |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../spring/integration/spring-integration.json     |   2 +-
 components/camel-spring-jdbc/pom.xml               |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/spring/jdbc/spring-jdbc.json   |   2 +-
 components/camel-spring-ldap/pom.xml               |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/springldap/spring-ldap.json    |   2 +-
 components/camel-spring-main/pom.xml               |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/spring-main.json       |   2 +-
 components/camel-spring-rabbitmq/pom.xml           |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/springrabbit/spring-rabbitmq.json    |   2 +-
 components/camel-spring-redis/pom.xml              |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/redis/spring-redis.json |   2 +-
 components/camel-spring-security/pom.xml           |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/spring-security.json   |   2 +-
 components/camel-spring-ws/pom.xml                 |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/spring/ws/spring-ws.json       |   2 +-
 components/camel-spring-xml/pom.xml                |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/spring-xml.json        |   2 +-
 components/camel-spring/pom.xml                    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../services/org/apache/camel/language.properties  |   2 +-
 .../apache/camel/component/event/spring-event.json |   2 +-
 .../org/apache/camel/language/spel/spel.json       |   2 +-
 components/camel-sql/pom.xml                       |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/sql/sql.json        |   2 +-
 .../camel/component/sql/stored/sql-stored.json     |   2 +-
 components/camel-ssh/pom.xml                       |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/ssh/ssh.json        |   2 +-
 components/camel-stax/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../services/org/apache/camel/language.properties  |   2 +-
 .../org/apache/camel/component/stax/stax.json      |   2 +-
 .../camel/language/xtokenizer/xtokenize.json       |   2 +-
 components/camel-stitch/pom.xml                    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/stitch/stitch.json  |   2 +-
 components/camel-stomp/pom.xml                     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/stomp/stomp.json    |   2 +-
 components/camel-stream/pom.xml                    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/stream/stream.json  |   2 +-
 components/camel-stringtemplate/pom.xml            |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/stringtemplate/string-template.json  |   2 +-
 components/camel-stub/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/stub/stub.json      |   2 +-
 components/camel-swagger-java/pom.xml              |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/swagger-java.json      |   2 +-
 components/camel-swift/pom.xml                     |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../apache/camel/dataformat/swift/mt/swiftMt.json  |   2 +-
 .../apache/camel/dataformat/swift/mx/swiftMx.json  |   2 +-
 components/camel-syslog/pom.xml                    |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../org/apache/camel/component/syslog/syslog.json  |   2 +-
 components/camel-tarfile/pom.xml                   |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../apache/camel/dataformat/tarfile/tarFile.json   |   2 +-
 components/camel-telegram/pom.xml                  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/telegram/telegram.json  |   2 +-
 .../camel-test/camel-test-cdi-junit5/pom.xml       |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/test-cdi-junit5.json   |   2 +-
 components/camel-test/camel-test-cdi/pom.xml       |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/test-cdi.json          |   2 +-
 components/camel-test/camel-test-junit5/pom.xml    |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/test-junit5.json       |   2 +-
 .../camel-test/camel-test-main-junit5/pom.xml      |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/test-main-junit5.json  |   2 +-
 .../camel-test/camel-test-spring-junit5/pom.xml    |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../generated/resources/test-spring-junit5.json    |   2 +-
 components/camel-test/camel-test-spring/pom.xml    |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/test-spring.json       |   2 +-
 components/camel-test/camel-test/pom.xml           |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../camel-test/src/generated/resources/test.json   |   2 +-
 components/camel-test/pom.xml                      |   2 +-
 components/camel-threadpoolfactory-vertx/pom.xml   |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../resources/threadpoolfactory-vertx.json         |   2 +-
 components/camel-thrift/pom.xml                    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../org/apache/camel/component/thrift/thrift.json  |   2 +-
 .../org/apache/camel/dataformat/thrift/thrift.json |   2 +-
 components/camel-tika/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/tika/tika.json      |   2 +-
 components/camel-timer/pom.xml                     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/timer/timer.json    |   2 +-
 components/camel-tracing/pom.xml                   |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/tracing.json           |   2 +-
 components/camel-twilio/pom.xml                    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/twilio/twilio.json  |   2 +-
 components/camel-twitter/pom.xml                   |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../directmessage/twitter-directmessage.json       |   2 +-
 .../component/twitter/search/twitter-search.json   |   2 +-
 .../twitter/timeline/twitter-timeline.json         |   2 +-
 components/camel-undertow-spring-security/pom.xml  |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../resources/undertow-spring-security.json        |   2 +-
 components/camel-undertow/pom.xml                  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/undertow/undertow.json  |   2 +-
 components/camel-univocity-parsers/pom.xml         |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../camel/dataformat/univocity/univocityCsv.json   |   2 +-
 .../camel/dataformat/univocity/univocityFixed.json |   2 +-
 .../camel/dataformat/univocity/univocityTsv.json   |   2 +-
 components/camel-validator/pom.xml                 |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/validator/validator.json       |   2 +-
 components/camel-velocity/pom.xml                  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/velocity/velocity.json  |   2 +-
 components/camel-vertx/camel-vertx-common/pom.xml  |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/vertx-common.json      |   2 +-
 components/camel-vertx/camel-vertx-http/pom.xml    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/vertx/http/vertx-http.json     |   2 +-
 .../camel-vertx-kafka-component/pom.xml            |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/vertx/kafka/vertx-kafka.json   |   2 +-
 .../camel-vertx-kafka-maven-plugin/pom.xml         |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../resources/vertx-kafka-maven-plugin.json        |   2 +-
 components/camel-vertx/camel-vertx-kafka/pom.xml   |   2 +-
 .../camel-vertx/camel-vertx-websocket/pom.xml      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/vertx/websocket/vertx-websocket.json |   2 +-
 components/camel-vertx/camel-vertx/pom.xml         |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/vertx/vertx.json    |   2 +-
 components/camel-vertx/pom.xml                     |   2 +-
 components/camel-vm/pom.xml                        |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/vm/vm.json          |   2 +-
 components/camel-wal/pom.xml                       |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../camel-wal/src/generated/resources/wal.json     |   2 +-
 components/camel-weather/pom.xml                   |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/weather/weather.json    |   2 +-
 components/camel-web3j/pom.xml                     |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/web3j/web3j.json    |   2 +-
 components/camel-webhook/pom.xml                   |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/webhook/webhook.json    |   2 +-
 components/camel-websocket-jsr356/pom.xml          |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/websocket/jsr356/websocket-jsr356.json   |   2 +-
 components/camel-websocket/pom.xml                 |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/websocket/websocket.json       |   2 +-
 components/camel-weka/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/weka/weka.json      |   2 +-
 components/camel-whatsapp/pom.xml                  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/whatsapp/whatsapp.json  |   2 +-
 components/camel-wordpress/pom.xml                 |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/wordpress/wordpress.json       |   2 +-
 components/camel-workday/pom.xml                   |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/workday/workday.json    |   2 +-
 components/camel-xchange/pom.xml                   |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/xchange/xchange.json    |   2 +-
 components/camel-xj/pom.xml                        |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/xj/xj.json          |   2 +-
 components/camel-xmlsecurity/pom.xml               |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../component/xmlsecurity/xmlsecurity-sign.json    |   2 +-
 .../component/xmlsecurity/xmlsecurity-verify.json  |   2 +-
 .../camel/dataformat/xmlsecurity/xmlSecurity.json  |   2 +-
 components/camel-xmpp/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/xmpp/xmpp.json      |   2 +-
 components/camel-xpath/pom.xml                     |   2 +-
 .../services/org/apache/camel/language.properties  |   2 +-
 .../org/apache/camel/language/xpath/xpath.json     |   2 +-
 components/camel-xslt-saxon/pom.xml                |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/xslt/saxon/xslt-saxon.json     |   2 +-
 components/camel-xslt/pom.xml                      |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/xslt/xslt.json      |   2 +-
 components/camel-xstream/pom.xml                   |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../apache/camel/dataformat/xstream/xstream.json   |   2 +-
 .../camel/dataformat/xstream/xstreamJson.json      |   2 +-
 components/camel-zendesk/pom.xml                   |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/zendesk/zendesk.json    |   2 +-
 components/camel-zip-deflater/pom.xml              |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../camel/dataformat/deflater/gzipDeflater.json    |   2 +-
 .../camel/dataformat/deflater/zipDeflater.json     |   2 +-
 components/camel-zipfile/pom.xml                   |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../apache/camel/dataformat/zipfile/zipFile.json   |   2 +-
 components/camel-zipkin/pom.xml                    |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/zipkin.json            |   2 +-
 components/camel-zookeeper-master/pom.xml          |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../zookeepermaster/zookeeper-master.json          |   2 +-
 components/camel-zookeeper/pom.xml                 |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/zookeeper/zookeeper.json       |   2 +-
 components/pom.xml                                 |   2 +-
 core/camel-api/pom.xml                             |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 core/camel-api/src/generated/resources/api.json    |   2 +-
 core/camel-base-engine/pom.xml                     |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/base-engine.json       |   2 +-
 core/camel-base/pom.xml                            |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 core/camel-base/src/generated/resources/base.json  |   2 +-
 core/camel-cloud/pom.xml                           |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../camel-cloud/src/generated/resources/cloud.json |   2 +-
 core/camel-cluster/pom.xml                         |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/cluster.json           |   2 +-
 core/camel-console/pom.xml                         |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/console.json           |   2 +-
 core/camel-core-all/pom.xml                        |   2 +-
 core/camel-core-catalog/pom.xml                    |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/core-catalog.json      |   2 +-
 core/camel-core-engine/pom.xml                     |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/core-engine.json       |   2 +-
 core/camel-core-languages/pom.xml                  |   2 +-
 .../services/org/apache/camel/language.properties  |   2 +-
 .../apache/camel/language/constant/constant.json   |   2 +-
 .../org/apache/camel/language/csimple/csimple.json |   2 +-
 .../org/apache/camel/language/header/header.json   |   2 +-
 .../camel/language/property/exchangeProperty.json  |   2 +-
 .../org/apache/camel/language/ref/ref.json         |   2 +-
 .../org/apache/camel/language/simple/file.json     |   2 +-
 .../org/apache/camel/language/simple/simple.json   |   2 +-
 .../apache/camel/language/tokenizer/tokenize.json  |   2 +-
 core/camel-core-model/pom.xml                      |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/core-model.json        |   2 +-
 core/camel-core-processor/pom.xml                  |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/core-processor.json    |   2 +-
 core/camel-core-reifier/pom.xml                    |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/core-reifier.json      |   2 +-
 core/camel-core-xml/pom.xml                        |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/core-xml.json          |   2 +-
 core/camel-core/pom.xml                            |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 core/camel-core/src/generated/resources/core.json  |   2 +-
 core/camel-health/pom.xml                          |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/health.json            |   2 +-
 core/camel-main/pom.xml                            |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 core/camel-main/src/generated/resources/main.json  |   2 +-
 core/camel-management-api/pom.xml                  |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/management-api.json    |   2 +-
 core/camel-management/pom.xml                      |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/management.json        |   2 +-
 core/camel-support/pom.xml                         |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/support.json           |   2 +-
 core/camel-util/pom.xml                            |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 core/camel-util/src/generated/resources/util.json  |   2 +-
 core/camel-xml-io-util/pom.xml                     |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/xml-io-util.json       |   2 +-
 core/camel-xml-io/pom.xml                          |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/xml-io.json            |   2 +-
 core/camel-xml-jaxb/pom.xml                        |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/xml-jaxb.json          |   2 +-
 core/camel-xml-jaxp/pom.xml                        |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/xml-jaxp.json          |   2 +-
 core/pom.xml                                       |   2 +-
 docs/pom.xml                                       |   2 +-
 dsl/camel-cli-connector/pom.xml                    |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/cli-connector.json     |   2 +-
 dsl/camel-componentdsl/pom.xml                     |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/componentdsl.json      |   2 +-
 .../src/generated/resources/metadata.json          | 700 ++++++++++-----------
 dsl/camel-dsl-modeline/pom.xml                     |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/dsl-modeline.json      |   2 +-
 dsl/camel-dsl-support/pom.xml                      |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/dsl-support.json       |   2 +-
 dsl/camel-endpointdsl-support/pom.xml              |   2 +-
 dsl/camel-endpointdsl/pom.xml                      |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/endpointdsl.json       |   2 +-
 .../camel-groovy-dsl-common/pom.xml                |   2 +-
 dsl/camel-groovy-dsl/camel-groovy-dsl-test/pom.xml |   2 +-
 dsl/camel-groovy-dsl/camel-groovy-dsl/pom.xml      |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/groovy-dsl.json        |   2 +-
 dsl/camel-groovy-dsl/pom.xml                       |   2 +-
 dsl/camel-java-joor-dsl/pom.xml                    |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/java-joor-dsl.json     |   2 +-
 dsl/camel-jbang/camel-jbang-core/pom.xml           |   2 +-
 dsl/camel-jbang/camel-jbang-main/pom.xml           |   2 +-
 dsl/camel-jbang/pom.xml                            |   2 +-
 dsl/camel-js-dsl/pom.xml                           |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/js-dsl.json            |   2 +-
 dsl/camel-jsh-dsl/pom.xml                          |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/jsh-dsl.json           |   2 +-
 dsl/camel-kamelet-main/pom.xml                     |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/kamelet-main.json      |   2 +-
 dsl/camel-kotlin-dsl/pom.xml                       |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/kotlin-dsl.json        |   2 +-
 dsl/camel-xml-io-dsl/pom.xml                       |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/xml-io-dsl.json        |   2 +-
 dsl/camel-xml-jaxb-dsl-test/cdi/pom.xml            |   2 +-
 dsl/camel-xml-jaxb-dsl-test/definition/pom.xml     |   2 +-
 dsl/camel-xml-jaxb-dsl-test/jbpm/pom.xml           |   2 +-
 dsl/camel-xml-jaxb-dsl-test/pom.xml                |   2 +-
 dsl/camel-xml-jaxb-dsl-test/spring/pom.xml         |   2 +-
 dsl/camel-xml-jaxb-dsl-test/swagger/pom.xml        |   2 +-
 dsl/camel-xml-jaxb-dsl/pom.xml                     |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/xml-jaxb-dsl.json      |   2 +-
 dsl/camel-yaml-dsl/camel-yaml-dsl-common/pom.xml   |   2 +-
 .../camel-yaml-dsl-deserializers/pom.xml           |   2 +-
 .../camel-yaml-dsl-maven-plugin/pom.xml            |   2 +-
 dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml          |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/yaml-dsl.json          |   2 +-
 dsl/camel-yaml-dsl/pom.xml                         |   2 +-
 dsl/pom.xml                                        |   2 +-
 etc/pom.xml                                        |   2 +-
 init/camel-bundle-plugin/pom.xml                   |   2 +-
 init/pom.xml                                       |   2 +-
 parent/pom.xml                                     |   2 +-
 pom.xml                                            |   2 +-
 test-infra/camel-test-infra-activemq/pom.xml       |   2 +-
 test-infra/camel-test-infra-arangodb/pom.xml       |   2 +-
 test-infra/camel-test-infra-artemis/pom.xml        |   2 +-
 test-infra/camel-test-infra-aws-common/pom.xml     |   2 +-
 test-infra/camel-test-infra-aws-v2/pom.xml         |   2 +-
 test-infra/camel-test-infra-azure-common/pom.xml   |   2 +-
 .../camel-test-infra-azure-storage-blob/pom.xml    |   2 +-
 .../pom.xml                                        |   2 +-
 .../camel-test-infra-azure-storage-queue/pom.xml   |   2 +-
 test-infra/camel-test-infra-cassandra/pom.xml      |   2 +-
 test-infra/camel-test-infra-chatscript/pom.xml     |   2 +-
 test-infra/camel-test-infra-common/pom.xml         |   2 +-
 test-infra/camel-test-infra-consul/pom.xml         |   2 +-
 test-infra/camel-test-infra-couchbase/pom.xml      |   2 +-
 test-infra/camel-test-infra-couchdb/pom.xml        |   2 +-
 .../camel-test-infra-dispatch-router/pom.xml       |   2 +-
 test-infra/camel-test-infra-elasticsearch/pom.xml  |   2 +-
 test-infra/camel-test-infra-etcd3/pom.xml          |   2 +-
 test-infra/camel-test-infra-fhir/pom.xml           |   2 +-
 test-infra/camel-test-infra-ftp/pom.xml            |   2 +-
 test-infra/camel-test-infra-google-pubsub/pom.xml  |   2 +-
 .../camel-test-infra-hashicorp-vault/pom.xml       |   2 +-
 test-infra/camel-test-infra-hbase/pom.xml          |   2 +-
 test-infra/camel-test-infra-hdfs/pom.xml           |   2 +-
 test-infra/camel-test-infra-ignite/pom.xml         |   2 +-
 test-infra/camel-test-infra-infinispan/pom.xml     |   2 +-
 test-infra/camel-test-infra-jdbc/pom.xml           |   2 +-
 test-infra/camel-test-infra-jetty/pom.xml          |   2 +-
 test-infra/camel-test-infra-kafka/pom.xml          |   2 +-
 .../camel-test-infra-messaging-common/pom.xml      |   2 +-
 .../camel-test-infra-microprofile-lra/pom.xml      |   2 +-
 test-infra/camel-test-infra-minio/pom.xml          |   2 +-
 test-infra/camel-test-infra-mongodb/pom.xml        |   2 +-
 test-infra/camel-test-infra-mosquitto/pom.xml      |   2 +-
 test-infra/camel-test-infra-nats/pom.xml           |   2 +-
 test-infra/camel-test-infra-openldap/pom.xml       |   2 +-
 test-infra/camel-test-infra-parent/pom.xml         |   2 +-
 test-infra/camel-test-infra-postgres/pom.xml       |   2 +-
 test-infra/camel-test-infra-pulsar/pom.xml         |   2 +-
 test-infra/camel-test-infra-rabbitmq/pom.xml       |   2 +-
 test-infra/camel-test-infra-redis/pom.xml          |   2 +-
 test-infra/camel-test-infra-solr/pom.xml           |   2 +-
 test-infra/camel-test-infra-xmpp/pom.xml           |   2 +-
 test-infra/camel-test-infra-zookeeper/pom.xml      |   2 +-
 test-infra/pom.xml                                 |   2 +-
 tests/camel-itest-cdi/pom.xml                      |   2 +-
 tests/camel-itest-jms2/pom.xml                     |   2 +-
 tests/camel-itest-standalone/pom.xml               |   2 +-
 tests/camel-itest/pom.xml                          |   2 +-
 tests/camel-partial-classpath-test/pom.xml         |   2 +-
 tests/camel-typeconverterscan-test/pom.xml         |   2 +-
 tests/pom.xml                                      |   2 +-
 .../camel-validator-test-resources/pom.xml         |   2 +-
 tests/test-bundles/mock-javamail_1.7/pom.xml       |   2 +-
 tests/test-bundles/pom.xml                         |   2 +-
 tooling/camel-tooling-model/pom.xml                |   2 +-
 tooling/camel-tooling-util/pom.xml                 |   2 +-
 tooling/camel-util-json/pom.xml                    |   2 +-
 tooling/maven/bom-generator-maven-plugin/pom.xml   |   2 +-
 .../maven/camel-api-component-maven-plugin/pom.xml |   2 +-
 tooling/maven/camel-component-maven-plugin/pom.xml |   2 +-
 .../pom.xml                                        |   2 +-
 tooling/maven/camel-javadoc-plugin/pom.xml         |   2 +-
 tooling/maven/camel-maven-plugin/pom.xml           |   2 +-
 tooling/maven/camel-package-maven-plugin/pom.xml   |   2 +-
 tooling/maven/camel-resources-plugin/pom.xml       |   2 +-
 tooling/maven/camel-restdsl-openapi-plugin/pom.xml |   2 +-
 tooling/maven/camel-restdsl-swagger-plugin/pom.xml |   2 +-
 tooling/maven/pom.xml                              |   2 +-
 tooling/maven/sync-properties-maven-plugin/pom.xml |   2 +-
 tooling/openapi-rest-dsl-generator/pom.xml         |   2 +-
 tooling/parent/pom.xml                             |   2 +-
 tooling/pom.xml                                    |   2 +-
 tooling/spi-annotations/pom.xml                    |   2 +-
 tooling/swagger-rest-dsl-generator/pom.xml         |   2 +-
 2038 files changed, 2387 insertions(+), 2387 deletions(-)

diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 8c759868057..ca92b773d6a 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
 
diff --git a/archetypes/camel-archetype-api-component/pom.xml b/archetypes/camel-archetype-api-component/pom.xml
index ebb9a6be8a1..b69cb07ff36 100644
--- a/archetypes/camel-archetype-api-component/pom.xml
+++ b/archetypes/camel-archetype-api-component/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>archetypes</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.camel.archetypes</groupId>
diff --git a/archetypes/camel-archetype-cdi/pom.xml b/archetypes/camel-archetype-cdi/pom.xml
index 476750e1d5f..3916e2c63ca 100644
--- a/archetypes/camel-archetype-cdi/pom.xml
+++ b/archetypes/camel-archetype-cdi/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>archetypes</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.camel.archetypes</groupId>
diff --git a/archetypes/camel-archetype-component/pom.xml b/archetypes/camel-archetype-component/pom.xml
index 1b02c2b6563..b3113a20333 100644
--- a/archetypes/camel-archetype-component/pom.xml
+++ b/archetypes/camel-archetype-component/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>archetypes</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.camel.archetypes</groupId>
diff --git a/archetypes/camel-archetype-dataformat/pom.xml b/archetypes/camel-archetype-dataformat/pom.xml
index 03f93cbd375..e6cb8267321 100644
--- a/archetypes/camel-archetype-dataformat/pom.xml
+++ b/archetypes/camel-archetype-dataformat/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>archetypes</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.camel.archetypes</groupId>
diff --git a/archetypes/camel-archetype-java/pom.xml b/archetypes/camel-archetype-java/pom.xml
index 7ab949bd861..6a8f00325d0 100644
--- a/archetypes/camel-archetype-java/pom.xml
+++ b/archetypes/camel-archetype-java/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>archetypes</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.camel.archetypes</groupId>
diff --git a/archetypes/camel-archetype-main/pom.xml b/archetypes/camel-archetype-main/pom.xml
index 9c8a464b6b6..eac960c5d7e 100644
--- a/archetypes/camel-archetype-main/pom.xml
+++ b/archetypes/camel-archetype-main/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>archetypes</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.camel.archetypes</groupId>
diff --git a/archetypes/camel-archetype-spring/pom.xml b/archetypes/camel-archetype-spring/pom.xml
index 1ca617997bf..dfad548d3ab 100644
--- a/archetypes/camel-archetype-spring/pom.xml
+++ b/archetypes/camel-archetype-spring/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>archetypes</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.camel.archetypes</groupId>
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index 501ecf8fde7..8abd85c1da0 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
 
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index dc1f5912422..c4c9e63092f 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel</artifactId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <artifactId>camel-bom</artifactId>
diff --git a/bom/pom.xml b/bom/pom.xml
index 5426877b0d4..470dfa18529 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
 
diff --git a/buildingtools/pom.xml b/buildingtools/pom.xml
index a8eccdc871d..7a031214e09 100644
--- a/buildingtools/pom.xml
+++ b/buildingtools/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-buildtools</artifactId>
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 9c251af95fa..37fcca96eb7 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -28,7 +28,7 @@
   </parent>
   <groupId>org.apache.camel</groupId>
   <artifactId>camel-dependencies</artifactId>
-  <version>3.20.0-SNAPSHOT</version>
+  <version>4.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Camel :: Dependencies</name>
   <description>Camel Dependencies POM</description>
diff --git a/catalog/camel-allcomponents/pom.xml b/catalog/camel-allcomponents/pom.xml
index bdf84996f06..b1ccafaf13e 100644
--- a/catalog/camel-allcomponents/pom.xml
+++ b/catalog/camel-allcomponents/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>catalog</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-allcomponents</artifactId>
diff --git a/catalog/camel-catalog-console/pom.xml b/catalog/camel-catalog-console/pom.xml
index 739641bf21c..b867f87ee32 100644
--- a/catalog/camel-catalog-console/pom.xml
+++ b/catalog/camel-catalog-console/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>catalog</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-catalog-console</artifactId>
diff --git a/catalog/camel-catalog-lucene/pom.xml b/catalog/camel-catalog-lucene/pom.xml
index 7ec9d5ad6c1..a4058848702 100644
--- a/catalog/camel-catalog-lucene/pom.xml
+++ b/catalog/camel-catalog-lucene/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>catalog</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-catalog-lucene</artifactId>
diff --git a/catalog/camel-catalog-maven/pom.xml b/catalog/camel-catalog-maven/pom.xml
index 72909e7f365..f4343c8237a 100644
--- a/catalog/camel-catalog-maven/pom.xml
+++ b/catalog/camel-catalog-maven/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>catalog</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-catalog-maven</artifactId>
diff --git a/catalog/camel-catalog/pom.xml b/catalog/camel-catalog/pom.xml
index f1b5a1df403..d2475a75d1f 100644
--- a/catalog/camel-catalog/pom.xml
+++ b/catalog/camel-catalog/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>catalog</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-catalog</artifactId>
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/activemq.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/activemq.json
index 34c0e33f83d..9ce3cd20f54 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/activemq.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/activemq.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-activemq",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "activemq",
     "extendsScheme": "jms",
     "syntax": "activemq:destinationType:destinationName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/amqp.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/amqp.json
index 4608b8a82a7..1b078c52e58 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/amqp.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/amqp.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-amqp",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "amqp",
     "extendsScheme": "jms",
     "syntax": "amqp:destinationType:destinationName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/arangodb.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/arangodb.json
index 5ea84ddfb1d..f87605638a8 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/arangodb.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/arangodb.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-arangodb",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "arangodb",
     "extendsScheme": "",
     "syntax": "arangodb:database",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/as2.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/as2.json
index 3f97052e972..eb38c8e73c3 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/as2.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/as2.json
@@ -12,7 +12,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-as2",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "as2",
     "extendsScheme": "",
     "syntax": "as2:apiName\/methodName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/asterisk.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/asterisk.json
index f8850608edd..deac555435f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/asterisk.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/asterisk.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-asterisk",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "asterisk",
     "extendsScheme": "",
     "syntax": "asterisk:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atlasmap.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atlasmap.json
index 2e58c819eb5..f5cd036ca82 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atlasmap.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atlasmap.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-atlasmap",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "atlasmap",
     "extendsScheme": "",
     "syntax": "atlasmap:resourceUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atmos.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atmos.json
index 8b566498721..c958700108a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atmos.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atmos.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-atmos",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "atmos",
     "extendsScheme": "",
     "syntax": "atmos:name\/operation",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atmosphere-websocket.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atmosphere-websocket.json
index 0a48d012c52..a0de8a221ea 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atmosphere-websocket.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atmosphere-websocket.json
@@ -12,7 +12,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-atmosphere-websocket",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "atmosphere-websocket",
     "extendsScheme": "servlet",
     "syntax": "atmosphere-websocket:servicePath",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atom.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atom.json
index 6eaea0f2aa3..503dc0ee86e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atom.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atom.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-atom",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "atom",
     "extendsScheme": "",
     "syntax": "atom:feedUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/avro.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/avro.json
index 58a11e79382..10dc148393a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/avro.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/avro.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-avro-rpc",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "avro",
     "extendsScheme": "",
     "syntax": "avro:transport:host:port\/messageName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-cloudtrail.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-cloudtrail.json
index 70b7719b748..658c15fa3a2 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-cloudtrail.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-cloudtrail.json
@@ -11,7 +11,7 @@
     "supportLevel": "Preview",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws-cloudtrail",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws-cloudtrail",
     "extendsScheme": "",
     "syntax": "aws-cloudtrail:label",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-secrets-manager.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-secrets-manager.json
index 52d774120af..076c2e4495c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-secrets-manager.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-secrets-manager.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws-secrets-manager",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws-secrets-manager",
     "extendsScheme": "",
     "syntax": "aws-secrets-manager:label",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-athena.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-athena.json
index b359c507c83..0d5b11c0b90 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-athena.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-athena.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-athena",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-athena",
     "extendsScheme": "",
     "syntax": "aws2-athena:label",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-cw.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-cw.json
index 1332c9dd761..29c1254edde 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-cw.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-cw.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-cw",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-cw",
     "extendsScheme": "",
     "syntax": "aws2-cw:namespace",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ddb.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ddb.json
index b398416bef1..0841770c3a5 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ddb.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ddb.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-ddb",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-ddb",
     "extendsScheme": "",
     "syntax": "aws2-ddb:tableName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ddbstream.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ddbstream.json
index 0f30cf3c791..baa5c3a98bb 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ddbstream.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ddbstream.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-ddb",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-ddbstream",
     "extendsScheme": "",
     "syntax": "aws2-ddbstream:tableName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ec2.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ec2.json
index 21c1b5bd6c7..ff7d1e711de 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ec2.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ec2.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-ec2",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-ec2",
     "extendsScheme": "",
     "syntax": "aws2-ec2:label",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ecs.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ecs.json
index eb05ba4b009..1529b590e06 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ecs.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ecs.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-ecs",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-ecs",
     "extendsScheme": "",
     "syntax": "aws2-ecs:label",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-eks.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-eks.json
index 930e3e84006..efcd23d690b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-eks.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-eks.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-eks",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-eks",
     "extendsScheme": "",
     "syntax": "aws2-eks:label",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-eventbridge.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-eventbridge.json
index 019914b4d6d..f4b5ee4bd2d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-eventbridge.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-eventbridge.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-eventbridge",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-eventbridge",
     "extendsScheme": "",
     "syntax": "aws2-eventbridge:\/\/eventbusNameOrArn",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-iam.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-iam.json
index 6f5a6d93d9e..a5e91a3a6c6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-iam.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-iam.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-iam",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-iam",
     "extendsScheme": "",
     "syntax": "aws2-iam:label",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis-firehose.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis-firehose.json
index 5430181d12f..beb11cc6253 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis-firehose.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis-firehose.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-kinesis",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-kinesis-firehose",
     "extendsScheme": "",
     "syntax": "aws2-kinesis-firehose:streamName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json
index 1d44d7248cf..96e0cb7a46b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-kinesis",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-kinesis",
     "extendsScheme": "",
     "syntax": "aws2-kinesis:streamName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kms.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kms.json
index 45525309661..f55d3200015 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kms.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kms.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-kms",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-kms",
     "extendsScheme": "",
     "syntax": "aws2-kms:label",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-lambda.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-lambda.json
index 62b46e940f4..d79986d895b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-lambda.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-lambda.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-lambda",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-lambda",
     "extendsScheme": "",
     "syntax": "aws2-lambda:function",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-mq.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-mq.json
index 0ff702ac54f..b0ffbd1a08e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-mq.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-mq.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-mq",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-mq",
     "extendsScheme": "",
     "syntax": "aws2-mq:label",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-msk.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-msk.json
index 5358711aa88..38f2c0ba6f7 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-msk.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-msk.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-msk",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-msk",
     "extendsScheme": "",
     "syntax": "aws2-msk:label",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-s3.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-s3.json
index f852ea74b8b..98172808cb6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-s3.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-s3.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-s3",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-s3",
     "extendsScheme": "",
     "syntax": "aws2-s3:\/\/bucketNameOrArn",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ses.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ses.json
index 5fc41a5b7be..e9ef7926a8a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ses.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ses.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-ses",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-ses",
     "extendsScheme": "",
     "syntax": "aws2-ses:from",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sns.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sns.json
index 666c1b37c10..3f90859092d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sns.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sns.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-sns",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-sns",
     "extendsScheme": "",
     "syntax": "aws2-sns:topicNameOrArn",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json
index 1633573e2cd..27351063f5d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sqs.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-sqs",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-sqs",
     "extendsScheme": "",
     "syntax": "aws2-sqs:queueNameOrArn",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sts.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sts.json
index 0e7c1ba57da..aa05d5ff580 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sts.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-sts.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-sts",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-sts",
     "extendsScheme": "",
     "syntax": "aws2-sts:label",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-translate.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-translate.json
index 852b484a3ad..3658b444bdf 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-translate.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-translate.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-translate",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-translate",
     "extendsScheme": "",
     "syntax": "aws2-translate:label",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-cosmosdb.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-cosmosdb.json
index ef43dea05fe..86eb1afa7ac 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-cosmosdb.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-cosmosdb.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-azure-cosmosdb",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "azure-cosmosdb",
     "extendsScheme": "",
     "syntax": "azure-cosmosdb:databaseName\/containerName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-eventhubs.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-eventhubs.json
index 5564bed1430..858395678bb 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-eventhubs.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-eventhubs.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-azure-eventhubs",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "azure-eventhubs",
     "extendsScheme": "",
     "syntax": "azure-eventhubs:namespace\/eventHubName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-key-vault.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-key-vault.json
index 0dcb1224dd3..a21a1f19802 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-key-vault.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-key-vault.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-azure-key-vault",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "azure-key-vault",
     "extendsScheme": "",
     "syntax": "azure-key-vault:vaultName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-servicebus.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-servicebus.json
index ae9c0de85e4..fa27e75ba1d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-servicebus.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-servicebus.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-azure-servicebus",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "azure-servicebus",
     "extendsScheme": "",
     "syntax": "azure-servicebus:topicOrQueueName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-storage-blob.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-storage-blob.json
index c8b075d593e..bba03f0733e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-storage-blob.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-storage-blob.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-azure-storage-blob",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "azure-storage-blob",
     "extendsScheme": "",
     "syntax": "azure-storage-blob:accountName\/containerName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-storage-datalake.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-storage-datalake.json
index 2e09a9e624e..c521104b7f6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-storage-datalake.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-storage-datalake.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-azure-storage-datalake",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "azure-storage-datalake",
     "extendsScheme": "",
     "syntax": "azure-storage-datalake:accountName\/fileSystemName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-storage-queue.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-storage-queue.json
index bd95264a1f7..96a92704feb 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-storage-queue.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-storage-queue.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-azure-storage-queue",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "azure-storage-queue",
     "extendsScheme": "",
     "syntax": "azure-storage-queue:accountName\/queueName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/bean-validator.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/bean-validator.json
index f8a6b3bf26d..b3fc004e416 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/bean-validator.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/bean-validator.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-bean-validator",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "bean-validator",
     "extendsScheme": "",
     "syntax": "bean-validator:label",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/bean.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/bean.json
index 0225be448d1..fdae82db103 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/bean.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/bean.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-bean",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "bean",
     "extendsScheme": "",
     "syntax": "bean:beanName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/bonita.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/bonita.json
index e6481d0cdaa..94f074474bd 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/bonita.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/bonita.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-bonita",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "bonita",
     "extendsScheme": "",
     "syntax": "bonita:operation",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/box.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/box.json
index e598440c97f..40fcab28992 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/box.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/box.json
@@ -12,7 +12,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-box",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "box",
     "extendsScheme": "",
     "syntax": "box:apiName\/methodName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/braintree.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/braintree.json
index a097834e7b0..1e73f6173b0 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/braintree.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/braintree.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-braintree",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "braintree",
     "extendsScheme": "",
     "syntax": "braintree:apiName\/methodName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/browse.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/browse.json
index 313956ca322..03bcb58ff73 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/browse.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/browse.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-browse",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "browse",
     "extendsScheme": "",
     "syntax": "browse:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/caffeine-cache.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/caffeine-cache.json
index 6b5e2dbe343..4cd72d45576 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/caffeine-cache.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/caffeine-cache.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-caffeine",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "caffeine-cache",
     "extendsScheme": "",
     "syntax": "caffeine-cache:cacheName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/caffeine-loadcache.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/caffeine-loadcache.json
index 3f5983fccf9..7ea134c4ca7 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/caffeine-loadcache.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/caffeine-loadcache.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-caffeine",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "caffeine-loadcache",
     "extendsScheme": "",
     "syntax": "caffeine-loadcache:cacheName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/chatscript.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/chatscript.json
index 0b375fde0ae..27d29876acc 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/chatscript.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/chatscript.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-chatscript",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "chatscript",
     "extendsScheme": "",
     "syntax": "chatscript:host:port\/botName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/chunk.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/chunk.json
index 76613fbf55e..53225068a6c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/chunk.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/chunk.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-chunk",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "chunk",
     "extendsScheme": "",
     "syntax": "chunk:resourceUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/class.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/class.json
index fc65514798c..91294473f5e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/class.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/class.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-bean",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "class",
     "extendsScheme": "",
     "syntax": "class:beanName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cm-sms.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cm-sms.json
index 1e93a6e817e..540561d7976 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cm-sms.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cm-sms.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-cm-sms",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "cm-sms",
     "extendsScheme": "",
     "syntax": "cm-sms:host",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cmis.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cmis.json
index 97b8eaf018c..cbebaf4d885 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cmis.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cmis.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-cmis",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "cmis",
     "extendsScheme": "",
     "syntax": "cmis:cmsUrl",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coap+tcp.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coap+tcp.json
index bb6b513b230..1b86da19ad7 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coap+tcp.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coap+tcp.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-coap",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "coap+tcp",
     "extendsScheme": "",
     "alternativeSchemes": "coap,coaps,coap+tcp,coaps+tcp",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coap.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coap.json
index 24b4d5699aa..509a5eb7aeb 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coap.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coap.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-coap",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "coap",
     "extendsScheme": "",
     "alternativeSchemes": "coap,coaps,coap+tcp,coaps+tcp",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coaps+tcp.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coaps+tcp.json
index 00b473ac0d8..e1656be546e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coaps+tcp.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coaps+tcp.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-coap",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "coaps+tcp",
     "extendsScheme": "",
     "alternativeSchemes": "coap,coaps,coap+tcp,coaps+tcp",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coaps.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coaps.json
index e7082bcd216..2978953085f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coaps.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coaps.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-coap",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "coaps",
     "extendsScheme": "",
     "alternativeSchemes": "coap,coaps,coap+tcp,coaps+tcp",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cometd.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cometd.json
index f07c7606602..d528f1c62e5 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cometd.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cometd.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-cometd",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "cometd",
     "extendsScheme": "",
     "alternativeSchemes": "cometd,cometds",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cometds.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cometds.json
index 36f0d7470c1..99f4bbb8d0a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cometds.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cometds.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-cometd",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "cometds",
     "extendsScheme": "",
     "alternativeSchemes": "cometd,cometds",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/consul.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/consul.json
index 7946ef3fa0e..a70764b82e3 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/consul.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/consul.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-consul",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "consul",
     "extendsScheme": "",
     "syntax": "consul:apiEndpoint",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/controlbus.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/controlbus.json
index e3d33aad975..fa9076b996a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/controlbus.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/controlbus.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-controlbus",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "controlbus",
     "extendsScheme": "",
     "syntax": "controlbus:command:language",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/corda.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/corda.json
index deb2649f5c3..f1da5c76f7f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/corda.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/corda.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-corda",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "corda",
     "extendsScheme": "",
     "syntax": "corda:node",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/couchbase.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/couchbase.json
index 1ad8c5bb047..0c5ab708a7c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/couchbase.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/couchbase.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-couchbase",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "couchbase",
     "extendsScheme": "",
     "syntax": "couchbase:protocol:\/\/hostname:port",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/couchdb.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/couchdb.json
index 8f3dada6a14..ee7b5fe7da4 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/couchdb.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/couchdb.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-couchdb",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "couchdb",
     "extendsScheme": "",
     "syntax": "couchdb:protocol:hostname:port\/database",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cql.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cql.json
index ea57bd07a74..6edd5780b4e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cql.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cql.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-cassandraql",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "cql",
     "extendsScheme": "",
     "syntax": "cql:beanRef:hosts:port\/keyspace",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cron.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cron.json
index 5c4543fa431..3c6d014c868 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cron.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cron.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-cron",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "cron",
     "extendsScheme": "",
     "syntax": "cron:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/crypto.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/crypto.json
index a25e2dbf5a0..32b92b7c386 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/crypto.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/crypto.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-crypto",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "crypto",
     "extendsScheme": "",
     "syntax": "crypto:cryptoOperation:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cxf.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cxf.json
index 0ed2dd9947e..4dbd0a7cdb8 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cxf.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cxf.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-cxf-soap",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "cxf",
     "extendsScheme": "",
     "syntax": "cxf:beanId:address",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cxfrs.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cxfrs.json
index 3ea9f3d07aa..3685dfd0f2c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cxfrs.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cxfrs.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-cxf-rest",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "cxfrs",
     "extendsScheme": "",
     "syntax": "cxfrs:beanId:address",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dataformat.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dataformat.json
index 5af06a59441..4c061d38bd6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dataformat.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dataformat.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-dataformat",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "dataformat",
     "extendsScheme": "",
     "syntax": "dataformat:name:operation",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dataset-test.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dataset-test.json
index b4856df6458..576705ab361 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dataset-test.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dataset-test.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-dataset",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "dataset-test",
     "extendsScheme": "",
     "syntax": "dataset-test:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dataset.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dataset.json
index 2ca9d34f8bd..cf7df07da64 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dataset.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dataset.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-dataset",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "dataset",
     "extendsScheme": "",
     "syntax": "dataset:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-db2.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-db2.json
index 24cf1035604..7a096b34d9d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-db2.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-db2.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-debezium-db2",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "debezium-db2",
     "extendsScheme": "",
     "syntax": "debezium-db2:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-mongodb.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-mongodb.json
index 9968f663896..e7eb9dd832e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-mongodb.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-mongodb.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-debezium-mongodb",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "debezium-mongodb",
     "extendsScheme": "",
     "syntax": "debezium-mongodb:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-mysql.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-mysql.json
index bc9d3fe23a2..253ec429524 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-mysql.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-mysql.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-debezium-mysql",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "debezium-mysql",
     "extendsScheme": "",
     "syntax": "debezium-mysql:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-oracle.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-oracle.json
index 887a26b9d8d..e6688e398c3 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-oracle.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-oracle.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-debezium-oracle",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "debezium-oracle",
     "extendsScheme": "",
     "syntax": "debezium-oracle:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-postgres.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-postgres.json
index b6e511c377d..f4266eadbcc 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-postgres.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-postgres.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-debezium-postgres",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "debezium-postgres",
     "extendsScheme": "",
     "syntax": "debezium-postgres:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-sqlserver.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-sqlserver.json
index 64d678d80c3..b71b4a16b0a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-sqlserver.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-sqlserver.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-debezium-sqlserver",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "debezium-sqlserver",
     "extendsScheme": "",
     "syntax": "debezium-sqlserver:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/digitalocean.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/digitalocean.json
index 02b32329557..0d6286229a7 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/digitalocean.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/digitalocean.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-digitalocean",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "digitalocean",
     "extendsScheme": "",
     "syntax": "digitalocean:operation",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/direct-vm.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/direct-vm.json
index 78dc7649e02..4111c260aa3 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/direct-vm.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/direct-vm.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-directvm",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "direct-vm",
     "extendsScheme": "",
     "syntax": "direct-vm:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/direct.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/direct.json
index 620856017cf..6d63484608f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/direct.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/direct.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-direct",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "direct",
     "extendsScheme": "",
     "syntax": "direct:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/disruptor-vm.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/disruptor-vm.json
index 2d19c1c3a6e..aebfeba74cb 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/disruptor-vm.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/disruptor-vm.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-disruptor",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "disruptor-vm",
     "extendsScheme": "",
     "alternativeSchemes": "disruptor,disruptor-vm",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/disruptor.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/disruptor.json
index 24892e208f7..1df69c0e1e4 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/disruptor.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/disruptor.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-disruptor",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "disruptor",
     "extendsScheme": "",
     "alternativeSchemes": "disruptor,disruptor-vm",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/djl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/djl.json
index 8975fe06948..4f70f784b5c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/djl.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/djl.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-djl",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "djl",
     "extendsScheme": "",
     "syntax": "djl:application",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dns.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dns.json
index 08187928fd1..aca5df72da4 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dns.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dns.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-dns",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "dns",
     "extendsScheme": "",
     "syntax": "dns:dnsType",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/docker.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/docker.json
index 3d9d8497d18..5a27654e470 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/docker.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/docker.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-docker",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "docker",
     "extendsScheme": "",
     "syntax": "docker:operation",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dozer.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dozer.json
index 975991d70eb..88d63dfd104 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dozer.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dozer.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-dozer",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "dozer",
     "extendsScheme": "",
     "syntax": "dozer:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/drill.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/drill.json
index dec7d49296f..ca74808c726 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/drill.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/drill.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-drill",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "drill",
     "extendsScheme": "",
     "syntax": "drill:host",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dropbox.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dropbox.json
index 626adb07be2..2971ecda649 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dropbox.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dropbox.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-dropbox",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "dropbox",
     "extendsScheme": "",
     "syntax": "dropbox:operation",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dynamic-router.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dynamic-router.json
index 0c88f10c855..0e6f67f9165 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dynamic-router.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dynamic-router.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-dynamic-router",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "dynamic-router",
     "extendsScheme": "",
     "syntax": "dynamic-router:channel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ehcache.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ehcache.json
index e22f1289c7c..79bc7bc8dd4 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ehcache.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ehcache.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-ehcache",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "ehcache",
     "extendsScheme": "",
     "syntax": "ehcache:cacheName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/elasticsearch-rest.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/elasticsearch-rest.json
index 4d5ce33dfcf..04ed68f8b15 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/elasticsearch-rest.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/elasticsearch-rest.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-elasticsearch-rest",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "elasticsearch-rest",
     "extendsScheme": "",
     "syntax": "elasticsearch-rest:clusterName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/elasticsearch.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/elasticsearch.json
index c236d6eace1..fe3f38f7a44 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/elasticsearch.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/elasticsearch.json
@@ -11,7 +11,7 @@
     "supportLevel": "Preview",
     "groupId": "org.apache.camel",
     "artifactId": "camel-elasticsearch",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "elasticsearch",
     "extendsScheme": "",
     "syntax": "elasticsearch:clusterName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/etcd3.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/etcd3.json
index 5e86b171346..2c4ea21473d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/etcd3.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/etcd3.json
@@ -11,7 +11,7 @@
     "supportLevel": "Preview",
     "groupId": "org.apache.camel",
     "artifactId": "camel-etcd3",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "etcd3",
     "extendsScheme": "",
     "syntax": "etcd3:path",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/exec.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/exec.json
index b9c6357f3c3..520e4ef92ca 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/exec.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/exec.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-exec",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "exec",
     "extendsScheme": "",
     "syntax": "exec:executable",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/facebook.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/facebook.json
index dc71305ad00..d3dccc27ca6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/facebook.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/facebook.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-facebook",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "facebook",
     "extendsScheme": "",
     "syntax": "facebook:methodName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/fhir.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/fhir.json
index 4feacadc55f..ce46522a691 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/fhir.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/fhir.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-fhir",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "fhir",
     "extendsScheme": "",
     "syntax": "fhir:apiName\/methodName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/file-watch.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/file-watch.json
index c39d15066bf..0ef5ca86e9a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/file-watch.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/file-watch.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-file-watch",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "file-watch",
     "extendsScheme": "",
     "syntax": "file-watch:path",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/file.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/file.json
index 9fdbefdf89d..a4c9e5fe5f2 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/file.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/file.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-file",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "file",
     "extendsScheme": "",
     "syntax": "file:directoryName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/flatpack.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/flatpack.json
index eb0e18186b9..261c5dbbb32 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/flatpack.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/flatpack.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-flatpack",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "flatpack",
     "extendsScheme": "",
     "syntax": "flatpack:type:resourceUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/flink.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/flink.json
index 4f8870985b1..90baa0127b0 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/flink.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/flink.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-flink",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "flink",
     "extendsScheme": "",
     "syntax": "flink:endpointType",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/fop.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/fop.json
index 442d688505e..81e7620a496 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/fop.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/fop.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-fop",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "fop",
     "extendsScheme": "",
     "syntax": "fop:outputType",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/freemarker.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/freemarker.json
index 1d57a4f9577..53c201e59f5 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/freemarker.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/freemarker.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-freemarker",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "freemarker",
     "extendsScheme": "",
     "syntax": "freemarker:resourceUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ftp.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ftp.json
index 1e12539113a..23ba3c7648e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ftp.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ftp.json
@@ -12,7 +12,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-ftp",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "ftp",
     "extendsScheme": "file",
     "syntax": "ftp:host:port\/directoryName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ftps.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ftps.json
index 46a7a0735e1..094f027725d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ftps.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ftps.json
@@ -12,7 +12,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-ftp",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "ftps",
     "extendsScheme": "file",
     "syntax": "ftps:host:port\/directoryName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/geocoder.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/geocoder.json
index 863fd019b8b..0d556397b31 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/geocoder.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/geocoder.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-geocoder",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "geocoder",
     "extendsScheme": "",
     "syntax": "geocoder:address:latlng",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/git.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/git.json
index 0ba084eb632..5163c6fa199 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/git.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/git.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-git",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "git",
     "extendsScheme": "",
     "syntax": "git:localPath",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/github.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/github.json
index aea9f2ac245..6087926c951 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/github.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/github.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-github",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "github",
     "extendsScheme": "",
     "syntax": "github:type\/branchName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-bigquery-sql.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-bigquery-sql.json
index 1f3b8ab0b06..2fcda04e583 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-bigquery-sql.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-bigquery-sql.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-google-bigquery",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "google-bigquery-sql",
     "extendsScheme": "",
     "syntax": "google-bigquery-sql:projectId:queryString",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-bigquery.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-bigquery.json
index f9aff114e38..e0e6841f1de 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-bigquery.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-bigquery.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-google-bigquery",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "google-bigquery",
     "extendsScheme": "",
     "syntax": "google-bigquery:projectId:datasetId:tableId",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-calendar-stream.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-calendar-stream.json
index 708608a1605..71ff08c1bee 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-calendar-stream.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-calendar-stream.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-google-calendar",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "google-calendar-stream",
     "extendsScheme": "",
     "syntax": "google-calendar-stream:index",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-calendar.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-calendar.json
index 96ed247ffff..2673b74e229 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-calendar.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-calendar.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-google-calendar",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "google-calendar",
     "extendsScheme": "",
     "syntax": "google-calendar:apiName\/methodName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-drive.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-drive.json
index 4ff2baef21f..34b7a9a0318 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-drive.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-drive.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-google-drive",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "google-drive",
     "extendsScheme": "",
     "syntax": "google-drive:apiName\/methodName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-functions.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-functions.json
index 32a5132b054..179021bdde4 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-functions.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-functions.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-google-functions",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "google-functions",
     "extendsScheme": "",
     "syntax": "google-functions:functionName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-mail-stream.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-mail-stream.json
index 8c426b68197..a144cc59445 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-mail-stream.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-mail-stream.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-google-mail",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "google-mail-stream",
     "extendsScheme": "",
     "syntax": "google-mail-stream:index",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-mail.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-mail.json
index 5224e23f008..75683f37fcf 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-mail.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-mail.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-google-mail",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "google-mail",
     "extendsScheme": "",
     "syntax": "google-mail:apiName\/methodName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-pubsub.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-pubsub.json
index 3f570106445..2dfeb427d5c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-pubsub.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-pubsub.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-google-pubsub",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "google-pubsub",
     "extendsScheme": "",
     "syntax": "google-pubsub:projectId:destinationName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-secret-manager.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-secret-manager.json
index 5519bebc4c0..d40ce6571ab 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-secret-manager.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-secret-manager.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-google-secret-manager",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "google-secret-manager",
     "extendsScheme": "",
     "syntax": "google-secret-manager:project",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets-stream.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets-stream.json
index 2229a0ce844..a57aeb9e471 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets-stream.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets-stream.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-google-sheets",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "google-sheets-stream",
     "extendsScheme": "",
     "syntax": "google-sheets-stream:spreadsheetId",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets.json
index 1909be2430f..844cffca910 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-google-sheets",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "google-sheets",
     "extendsScheme": "",
     "syntax": "google-sheets:apiName\/methodName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-storage.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-storage.json
index 95b782097c0..07700fb0ca1 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-storage.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-storage.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-google-storage",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "google-storage",
     "extendsScheme": "",
     "syntax": "google-storage:bucketName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/gora.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/gora.json
index b27fe423014..c7ffda5919a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/gora.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/gora.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-gora",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "gora",
     "extendsScheme": "",
     "syntax": "gora:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/grape.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/grape.json
index 879d31557e4..0964171c112 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/grape.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/grape.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-grape",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "grape",
     "extendsScheme": "",
     "syntax": "grape:defaultCoordinates",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/graphql.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/graphql.json
index 29f0ba538ed..5efbcb8c13d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/graphql.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/graphql.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-graphql",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "graphql",
     "extendsScheme": "",
     "syntax": "graphql:httpUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/grpc.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/grpc.json
index 983af254b6b..a1f25bb56b3 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/grpc.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/grpc.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-grpc",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "grpc",
     "extendsScheme": "",
     "syntax": "grpc:host:port\/service",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/guava-eventbus.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/guava-eventbus.json
index 72ca0c36eac..4d6cee467c9 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/guava-eventbus.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/guava-eventbus.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-guava-eventbus",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "guava-eventbus",
     "extendsScheme": "",
     "syntax": "guava-eventbus:eventBusRef",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hashicorp-vault.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hashicorp-vault.json
index a5b5df64809..051be7f1c08 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hashicorp-vault.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hashicorp-vault.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-hashicorp-vault",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "hashicorp-vault",
     "extendsScheme": "",
     "syntax": "hashicorp-vault:secretsEngine",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-atomicvalue.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-atomicvalue.json
index fbb2c66e60c..6c0cf4a284d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-atomicvalue.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-atomicvalue.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-hazelcast",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "hazelcast-atomicvalue",
     "extendsScheme": "",
     "syntax": "hazelcast-atomicvalue:cacheName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-instance.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-instance.json
index 2ae12b475a1..b1f49a37053 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-instance.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-instance.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-hazelcast",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "hazelcast-instance",
     "extendsScheme": "",
     "syntax": "hazelcast-instance:cacheName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-list.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-list.json
index 506c77012de..de40284fe79 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-list.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-list.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-hazelcast",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "hazelcast-list",
     "extendsScheme": "",
     "syntax": "hazelcast-list:cacheName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-map.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-map.json
index 65f87ee36b0..1176499b99b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-map.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-map.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-hazelcast",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "hazelcast-map",
     "extendsScheme": "",
     "syntax": "hazelcast-map:cacheName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-multimap.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-multimap.json
index a10e605f2af..d60d037c7ed 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-multimap.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-multimap.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-hazelcast",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "hazelcast-multimap",
     "extendsScheme": "",
     "syntax": "hazelcast-multimap:cacheName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-queue.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-queue.json
index e5890a14ee0..b6c5869d78b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-queue.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-queue.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-hazelcast",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "hazelcast-queue",
     "extendsScheme": "",
     "syntax": "hazelcast-queue:cacheName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-replicatedmap.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-replicatedmap.json
index c6c8541290a..7da97f5df7d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-replicatedmap.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-replicatedmap.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-hazelcast",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "hazelcast-replicatedmap",
     "extendsScheme": "",
     "syntax": "hazelcast-replicatedmap:cacheName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-ringbuffer.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-ringbuffer.json
index d8eab4727de..7dda62c3707 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-ringbuffer.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-ringbuffer.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-hazelcast",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "hazelcast-ringbuffer",
     "extendsScheme": "",
     "syntax": "hazelcast-ringbuffer:cacheName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-seda.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-seda.json
index 26352d1583c..b4792c7f895 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-seda.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-seda.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-hazelcast",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "hazelcast-seda",
     "extendsScheme": "",
     "syntax": "hazelcast-seda:cacheName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-set.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-set.json
index 8b9aa24ee6e..bb4140c4e2c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-set.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-set.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-hazelcast",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "hazelcast-set",
     "extendsScheme": "",
     "syntax": "hazelcast-set:cacheName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-topic.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-topic.json
index 31c8ebeaed0..bbcce8f7d0e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-topic.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hazelcast-topic.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-hazelcast",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "hazelcast-topic",
     "extendsScheme": "",
     "syntax": "hazelcast-topic:cacheName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hbase.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hbase.json
index c31324b11e5..5f21f418e7c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hbase.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hbase.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-hbase",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "hbase",
     "extendsScheme": "",
     "syntax": "hbase:tableName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hdfs.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hdfs.json
index c7a4535ce23..8c77a857c87 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hdfs.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hdfs.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-hdfs",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "hdfs",
     "extendsScheme": "",
     "syntax": "hdfs:hostName:port\/path",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/http.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/http.json
index 89519a465c0..db1b3cbd039 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/http.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/http.json
@@ -12,7 +12,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-http",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "http",
     "extendsScheme": "",
     "alternativeSchemes": "http,https",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/https.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/https.json
index b20f3f06cc7..e288dfaf5f0 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/https.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/https.json
@@ -12,7 +12,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-http",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "https",
     "extendsScheme": "",
     "alternativeSchemes": "http,https",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-dms.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-dms.json
index 025a77691c8..cccb3e910ee 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-dms.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-dms.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-huaweicloud-dms",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "hwcloud-dms",
     "extendsScheme": "",
     "syntax": "hwcloud-dms:operation",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-frs.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-frs.json
index 090e1921fde..6626d121bb7 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-frs.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-frs.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-huaweicloud-frs",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "hwcloud-frs",
     "extendsScheme": "",
     "syntax": "hwcloud-frs:operation",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-functiongraph.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-functiongraph.json
index c4ed3a7a30a..0123500aafa 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-functiongraph.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-functiongraph.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-huaweicloud-functiongraph",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "hwcloud-functiongraph",
     "extendsScheme": "",
     "syntax": "hwcloud-functiongraph:operation",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-iam.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-iam.json
index c249ca53f6b..14cf058766a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-iam.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-iam.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-huaweicloud-iam",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "hwcloud-iam",
     "extendsScheme": "",
     "syntax": "hwcloud-iam:operation",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-imagerecognition.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-imagerecognition.json
index 618c0fd2150..7bbdb015c90 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-imagerecognition.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-imagerecognition.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-huaweicloud-imagerecognition",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "hwcloud-imagerecognition",
     "extendsScheme": "",
     "syntax": "hwcloud-imagerecognition:operation",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-obs.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-obs.json
index 6a5f0d6701e..212cf02808d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-obs.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-obs.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-huaweicloud-obs",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "hwcloud-obs",
     "extendsScheme": "",
     "syntax": "hwcloud-obs:operation",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-smn.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-smn.json
index 6ef4b7b9d2a..06a539a3db5 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-smn.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hwcloud-smn.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-huaweicloud-smn",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "hwcloud-smn",
     "extendsScheme": "",
     "syntax": "hwcloud-smn:smnService",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hyperledger-aries.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hyperledger-aries.json
index 06b9344edfd..01f1ce32f59 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hyperledger-aries.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/hyperledger-aries.json
@@ -11,7 +11,7 @@
     "supportLevel": "Preview",
     "groupId": "org.apache.camel",
     "artifactId": "camel-hyperledger-aries",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "hyperledger-aries",
     "extendsScheme": "",
     "syntax": "hyperledger-aries:walletName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/iec60870-client.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/iec60870-client.json
index 9b5e423241e..e12fef9de6c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/iec60870-client.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/iec60870-client.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-iec60870",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "iec60870-client",
     "extendsScheme": "",
     "syntax": "iec60870-client:uriPath",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/iec60870-server.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/iec60870-server.json
index 7a078c69b36..db15c67e89c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/iec60870-server.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/iec60870-server.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-iec60870",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "iec60870-server",
     "extendsScheme": "",
     "syntax": "iec60870-server:uriPath",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-cache.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-cache.json
index 794df13ed00..23c5484efd5 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-cache.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-cache.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-ignite",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "ignite-cache",
     "extendsScheme": "",
     "syntax": "ignite-cache:cacheName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-compute.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-compute.json
index 79f79598691..8252eae427a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-compute.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-compute.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-ignite",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "ignite-compute",
     "extendsScheme": "",
     "syntax": "ignite-compute:endpointId",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-events.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-events.json
index b5ad6060fa9..be0a4a1822f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-events.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-events.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-ignite",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "ignite-events",
     "extendsScheme": "",
     "syntax": "ignite-events:endpointId",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-idgen.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-idgen.json
index abbe05ca0dc..646a9f50153 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-idgen.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-idgen.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-ignite",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "ignite-idgen",
     "extendsScheme": "",
     "syntax": "ignite-idgen:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-messaging.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-messaging.json
index b95e5e15bd3..71e748f997c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-messaging.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-messaging.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-ignite",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "ignite-messaging",
     "extendsScheme": "",
     "syntax": "ignite-messaging:topic",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-queue.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-queue.json
index 6e3c783bda4..276c0d73da4 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-queue.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-queue.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-ignite",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "ignite-queue",
     "extendsScheme": "",
     "syntax": "ignite-queue:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-set.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-set.json
index 1882695f2a5..c385a569819 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-set.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ignite-set.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-ignite",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "ignite-set",
     "extendsScheme": "",
     "syntax": "ignite-set:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/imap.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/imap.json
index 7215f35734a..48da566f3f5 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/imap.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/imap.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-mail",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "imap",
     "extendsScheme": "",
     "alternativeSchemes": "imap,imaps,pop3,pop3s,smtp,smtps",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/imaps.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/imaps.json
index 5c428db3706..025c2ae59f8 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/imaps.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/imaps.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-mail",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "imaps",
     "extendsScheme": "",
     "alternativeSchemes": "imap,imaps,pop3,pop3s,smtp,smtps",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/infinispan-embedded.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/infinispan-embedded.json
index 51f9991de31..02619b7abb2 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/infinispan-embedded.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/infinispan-embedded.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-infinispan-embedded",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "infinispan-embedded",
     "extendsScheme": "",
     "syntax": "infinispan-embedded:cacheName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/infinispan.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/infinispan.json
index ecae21ff3b8..e72c15e6ec4 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/infinispan.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/infinispan.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-infinispan",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "infinispan",
     "extendsScheme": "",
     "syntax": "infinispan:cacheName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/influxdb.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/influxdb.json
index 9bc3300fb91..f72f2a9d30b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/influxdb.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/influxdb.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-influxdb",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "influxdb",
     "extendsScheme": "",
     "syntax": "influxdb:connectionBean",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/iota.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/iota.json
index 9421378fecb..f3dd140bb81 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/iota.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/iota.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-iota",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "iota",
     "extendsScheme": "",
     "syntax": "iota:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ipfs.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ipfs.json
index 89f13aec64c..4fedd485074 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ipfs.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ipfs.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-ipfs",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "ipfs",
     "extendsScheme": "",
     "syntax": "ipfs:ipfsCmd",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/irc.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/irc.json
index 9ca1290bbd0..66ccfd6a87b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/irc.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/irc.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-irc",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "irc",
     "extendsScheme": "",
     "syntax": "irc:hostname:port",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ironmq.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ironmq.json
index 116c778a6ad..e57b4e8618c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ironmq.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ironmq.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-ironmq",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "ironmq",
     "extendsScheme": "",
     "syntax": "ironmq:queueName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jbpm.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jbpm.json
index 2652a332d79..dfd1041f4f3 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jbpm.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jbpm.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jbpm",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "jbpm",
     "extendsScheme": "",
     "syntax": "jbpm:connectionURL",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jcache.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jcache.json
index 2f13cb3a552..6afeaaecd0c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jcache.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jcache.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jcache",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "jcache",
     "extendsScheme": "",
     "syntax": "jcache:cacheName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jclouds.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jclouds.json
index b03f9c294ab..d6bb66cca23 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jclouds.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jclouds.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jclouds",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "jclouds",
     "extendsScheme": "",
     "syntax": "jclouds:command:providerId",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jcr.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jcr.json
index 9362152f353..b0b55ba2671 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jcr.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jcr.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jcr",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "jcr",
     "extendsScheme": "",
     "syntax": "jcr:host\/base",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jdbc.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jdbc.json
index fe49de40f44..08c771c0df8 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jdbc.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jdbc.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jdbc",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "jdbc",
     "extendsScheme": "",
     "syntax": "jdbc:dataSourceName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json
index f030bb61c29..2cd2c2c9d24 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json
@@ -12,7 +12,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jetty",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "jetty",
     "extendsScheme": "http",
     "syntax": "jetty:httpUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jgroups-raft.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jgroups-raft.json
index 96caba0ba71..4aaa1235e96 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jgroups-raft.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jgroups-raft.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jgroups-raft",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "jgroups-raft",
     "extendsScheme": "",
     "syntax": "jgroups-raft:clusterName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jgroups.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jgroups.json
index b4dea96a8b6..5e24b7908da 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jgroups.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jgroups.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jgroups",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "jgroups",
     "extendsScheme": "",
     "syntax": "jgroups:clusterName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jira.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jira.json
index f0b0b9a3dde..b93c198b9ee 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jira.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jira.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jira",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "jira",
     "extendsScheme": "",
     "syntax": "jira:type",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jms.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jms.json
index b40a8c58a1b..e01f051ded9 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jms.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jms.json
@@ -12,7 +12,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jms",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "jms",
     "extendsScheme": "",
     "syntax": "jms:destinationType:destinationName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jmx.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jmx.json
index 9e217845863..f294d215475 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jmx.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jmx.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jmx",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "jmx",
     "extendsScheme": "",
     "syntax": "jmx:serverURL",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jolt.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jolt.json
index d3aadf4b8ac..3332af87ab8 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jolt.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jolt.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jolt",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "jolt",
     "extendsScheme": "",
     "syntax": "jolt:resourceUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jooq.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jooq.json
index ac44fdbcefa..fb1f1b6a4cd 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jooq.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jooq.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jooq",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "jooq",
     "extendsScheme": "",
     "syntax": "jooq:entityType",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jpa.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jpa.json
index 19676600cdd..40bf66432ea 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jpa.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jpa.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jpa",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "jpa",
     "extendsScheme": "",
     "syntax": "jpa:entityType",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jslt.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jslt.json
index 6c8af8ccff4..4fd852c8c13 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jslt.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jslt.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jslt",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "jslt",
     "extendsScheme": "",
     "syntax": "jslt:resourceUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/json-patch.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/json-patch.json
index 84e10097234..68dccdeaffd 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/json-patch.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/json-patch.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-json-patch",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "json-patch",
     "extendsScheme": "",
     "syntax": "json-patch:resourceUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/json-validator.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/json-validator.json
index e09ea697320..f70d4367866 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/json-validator.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/json-validator.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-json-validator",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "json-validator",
     "extendsScheme": "",
     "syntax": "json-validator:resourceUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jsonata.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jsonata.json
index d62db885779..527c221134e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jsonata.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jsonata.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jsonata",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "jsonata",
     "extendsScheme": "",
     "syntax": "jsonata:resourceUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jt400.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jt400.json
index dc9f96e47ff..8afd8a8926f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jt400.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jt400.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jt400",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "jt400",
     "extendsScheme": "",
     "syntax": "jt400:userID:password@systemName\/QSYS.LIB\/objectPath.type",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kafka.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kafka.json
index 21f068dd50e..b64a9f18860 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kafka.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kafka.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-kafka",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "kafka",
     "extendsScheme": "",
     "syntax": "kafka:topic",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kamelet.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kamelet.json
index dd5351120da..b9c28f9d42c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kamelet.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kamelet.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-kamelet",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "kamelet",
     "extendsScheme": "",
     "syntax": "kamelet:templateId\/routeId",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/knative.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/knative.json
index a07448c7e5f..186a906db4c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/knative.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/knative.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-knative",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "knative",
     "extendsScheme": "",
     "syntax": "knative:type\/typeId",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-config-maps.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-config-maps.json
index 4d2a192a486..2531cdf9c2a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-config-maps.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-config-maps.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-kubernetes",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "kubernetes-config-maps",
     "extendsScheme": "",
     "syntax": "kubernetes-config-maps:masterUrl",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-custom-resources.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-custom-resources.json
index aaad6747749..54dff9686f7 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-custom-resources.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-custom-resources.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-kubernetes",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "kubernetes-custom-resources",
     "extendsScheme": "",
     "syntax": "kubernetes-custom-resources:masterUrl",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-deployments.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-deployments.json
index c50084c8b43..191fd6fa7c5 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-deployments.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-deployments.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-kubernetes",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "kubernetes-deployments",
     "extendsScheme": "",
     "syntax": "kubernetes-deployments:masterUrl",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-events.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-events.json
index 3a0c2ce2f67..f11231650bc 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-events.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-events.json
@@ -11,7 +11,7 @@
     "supportLevel": "Preview",
     "groupId": "org.apache.camel",
     "artifactId": "camel-kubernetes",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "kubernetes-events",
     "extendsScheme": "",
     "syntax": "kubernetes-events:masterUrl",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-hpa.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-hpa.json
index 6161640e074..b2ca2791c52 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-hpa.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-hpa.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-kubernetes",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "kubernetes-hpa",
     "extendsScheme": "",
     "syntax": "kubernetes-hpa:masterUrl",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-job.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-job.json
index 853cadd1294..699138b68d0 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-job.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-job.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-kubernetes",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "kubernetes-job",
     "extendsScheme": "",
     "syntax": "kubernetes-job:masterUrl",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-namespaces.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-namespaces.json
index ccdedbf0c6c..d795c2522ac 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-namespaces.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-namespaces.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-kubernetes",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "kubernetes-namespaces",
     "extendsScheme": "",
     "syntax": "kubernetes-namespaces:masterUrl",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-nodes.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-nodes.json
index 0023c6df1a1..341dbdfca9c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-nodes.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-nodes.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-kubernetes",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "kubernetes-nodes",
     "extendsScheme": "",
     "syntax": "kubernetes-nodes:masterUrl",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-persistent-volumes-claims.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-persistent-volumes-claims.json
index e1dcb351f96..5eaea356045 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-persistent-volumes-claims.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-persistent-volumes-claims.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-kubernetes",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "kubernetes-persistent-volumes-claims",
     "extendsScheme": "",
     "syntax": "kubernetes-persistent-volumes-claims:masterUrl",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-persistent-volumes.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-persistent-volumes.json
index a7124e137ea..35e30a1b3a3 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-persistent-volumes.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-persistent-volumes.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-kubernetes",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "kubernetes-persistent-volumes",
     "extendsScheme": "",
     "syntax": "kubernetes-persistent-volumes:masterUrl",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-pods.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-pods.json
index 350cbf63ce4..806288c5025 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-pods.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-pods.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-kubernetes",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "kubernetes-pods",
     "extendsScheme": "",
     "syntax": "kubernetes-pods:masterUrl",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-replication-controllers.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-replication-controllers.json
index be53c1e2aa6..ecedc783745 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-replication-controllers.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-replication-controllers.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-kubernetes",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "kubernetes-replication-controllers",
     "extendsScheme": "",
     "syntax": "kubernetes-replication-controllers:masterUrl",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-resources-quota.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-resources-quota.json
index 87cf8773d47..7ceba90e905 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-resources-quota.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-resources-quota.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-kubernetes",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "kubernetes-resources-quota",
     "extendsScheme": "",
     "syntax": "kubernetes-resources-quota:masterUrl",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-secrets.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-secrets.json
index 01e2836ef18..7d22c174ba5 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-secrets.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-secrets.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-kubernetes",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "kubernetes-secrets",
     "extendsScheme": "",
     "syntax": "kubernetes-secrets:masterUrl",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-service-accounts.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-service-accounts.json
index 2f851f59b8f..d085c6fcc3b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-service-accounts.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-service-accounts.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-kubernetes",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "kubernetes-service-accounts",
     "extendsScheme": "",
     "syntax": "kubernetes-service-accounts:masterUrl",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-services.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-services.json
index 2c04e9442e7..04d40fa8e73 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-services.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kubernetes-services.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-kubernetes",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "kubernetes-services",
     "extendsScheme": "",
     "syntax": "kubernetes-services:masterUrl",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kudu.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kudu.json
index ffa43bf8270..6d7d251447d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kudu.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kudu.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-kudu",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "kudu",
     "extendsScheme": "",
     "syntax": "kudu:host:port\/tableName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/language.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/language.json
index f71fb5c79eb..51041f6cfa7 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/language.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/language.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-language",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "language",
     "extendsScheme": "",
     "syntax": "language:languageName:resourceUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ldap.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ldap.json
index 08ed940b2af..2731236c170 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ldap.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ldap.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-ldap",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "ldap",
     "extendsScheme": "",
     "syntax": "ldap:dirContextName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ldif.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ldif.json
index 7da57da6d9c..978f16a5a0a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ldif.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ldif.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-ldif",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "ldif",
     "extendsScheme": "",
     "syntax": "ldif:ldapConnectionName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/log.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/log.json
index 2a63759b36b..d5c71facda9 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/log.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/log.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-log",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "log",
     "extendsScheme": "",
     "syntax": "log:loggerName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/lpr.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/lpr.json
index a80a443ae23..dbc2404dbf6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/lpr.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/lpr.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-printer",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "lpr",
     "extendsScheme": "",
     "syntax": "lpr:hostname:port\/printername",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/lucene.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/lucene.json
index 31b6ea70a61..1dc11f2478e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/lucene.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/lucene.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-lucene",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "lucene",
     "extendsScheme": "",
     "syntax": "lucene:host:operation",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/lumberjack.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/lumberjack.json
index e5721eddb7a..552bed16231 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/lumberjack.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/lumberjack.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-lumberjack",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "lumberjack",
     "extendsScheme": "",
     "syntax": "lumberjack:host:port",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mapstruct.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mapstruct.json
index fd05ee332ed..19623ef1879 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mapstruct.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mapstruct.json
@@ -11,7 +11,7 @@
     "supportLevel": "Preview",
     "groupId": "org.apache.camel",
     "artifactId": "camel-mapstruct",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "mapstruct",
     "extendsScheme": "",
     "syntax": "mapstruct:className",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/master.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/master.json
index 09b96aba975..0a4a41b64ad 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/master.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/master.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-master",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "master",
     "extendsScheme": "",
     "syntax": "master:namespace:delegateUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/metrics.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/metrics.json
index ffb045fc20b..919396a1dd9 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/metrics.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/metrics.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-metrics",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "metrics",
     "extendsScheme": "",
     "syntax": "metrics:metricsType:metricsName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/micrometer.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/micrometer.json
index 8ffa980fb0e..aa5acf5df96 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/micrometer.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/micrometer.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-micrometer",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "micrometer",
     "extendsScheme": "",
     "syntax": "micrometer:metricsType:metricsName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/microprofile-metrics.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/microprofile-metrics.json
index 5ee19c4e5b4..c386e6973ff 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/microprofile-metrics.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/microprofile-metrics.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-microprofile-metrics",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "microprofile-metrics",
     "extendsScheme": "",
     "syntax": "microprofile-metrics:metricType:metricName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/milo-browse.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/milo-browse.json
index 55d1efa5375..6a3d643ee38 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/milo-browse.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/milo-browse.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-milo",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "milo-browse",
     "extendsScheme": "",
     "syntax": "milo-browse:endpointUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/milo-client.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/milo-client.json
index 02d5d88dcb5..bc226e5d244 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/milo-client.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/milo-client.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-milo",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "milo-client",
     "extendsScheme": "",
     "syntax": "milo-client:endpointUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/milo-server.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/milo-server.json
index 516ecd4bba1..524e6499462 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/milo-server.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/milo-server.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-milo",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "milo-server",
     "extendsScheme": "",
     "syntax": "milo-server:itemId",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mina.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mina.json
index 5978a7e21e1..4ea50833e6f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mina.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mina.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-mina",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "mina",
     "extendsScheme": "",
     "syntax": "mina:protocol:host:port",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/minio.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/minio.json
index 5f41fa32ab6..17159226b6f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/minio.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/minio.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-minio",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "minio",
     "extendsScheme": "",
     "syntax": "minio:bucketName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mllp.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mllp.json
index 680d5863e16..6511abadfa7 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mllp.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mllp.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-mllp",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "mllp",
     "extendsScheme": "",
     "syntax": "mllp:hostname:port",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mock.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mock.json
index 62bd9e99846..9d847a6c570 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mock.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mock.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-mock",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "mock",
     "extendsScheme": "",
     "syntax": "mock:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mongodb-gridfs.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mongodb-gridfs.json
index 2ae5df7798a..8c1be0bc2b2 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mongodb-gridfs.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mongodb-gridfs.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-mongodb-gridfs",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "mongodb-gridfs",
     "extendsScheme": "",
     "syntax": "mongodb-gridfs:connectionBean",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mongodb.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mongodb.json
index a9c4a48756b..9e2f7ac6106 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mongodb.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mongodb.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-mongodb",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "mongodb",
     "extendsScheme": "",
     "syntax": "mongodb:connectionBean",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mustache.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mustache.json
index 017fb0f5641..9a3f54db3cb 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mustache.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mustache.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-mustache",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "mustache",
     "extendsScheme": "",
     "syntax": "mustache:resourceUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mvel.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mvel.json
index 38366a5b2c1..ea13237ed57 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mvel.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mvel.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-mvel",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "mvel",
     "extendsScheme": "",
     "syntax": "mvel:resourceUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mybatis-bean.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mybatis-bean.json
index d84d12fd196..83b2de59449 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mybatis-bean.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mybatis-bean.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-mybatis",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "mybatis-bean",
     "extendsScheme": "",
     "syntax": "mybatis-bean:beanName:methodName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mybatis.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mybatis.json
index 3212b33fcd5..918b3fd52c4 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mybatis.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/mybatis.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-mybatis",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "mybatis",
     "extendsScheme": "",
     "syntax": "mybatis:statement",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/nats.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/nats.json
index 797ca739193..5e1f00fe4c3 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/nats.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/nats.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-nats",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "nats",
     "extendsScheme": "",
     "syntax": "nats:topic",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/netty-http.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/netty-http.json
index 640faaeb71c..e72732aca64 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/netty-http.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/netty-http.json
@@ -12,7 +12,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-netty-http",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "netty-http",
     "extendsScheme": "netty",
     "syntax": "netty-http:protocol:\/\/host:port\/path",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/netty.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/netty.json
index 48ca531ea25..893b3d10bc3 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/netty.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/netty.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-netty",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "netty",
     "extendsScheme": "",
     "syntax": "netty:protocol:\/\/host:port",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/nitrite.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/nitrite.json
index c30bcf9de1b..c9d4bbe60af 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/nitrite.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/nitrite.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-nitrite",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "nitrite",
     "extendsScheme": "",
     "syntax": "nitrite:database",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/oaipmh.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/oaipmh.json
index 42e56b89998..63f57d7cfc5 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/oaipmh.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/oaipmh.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-oaipmh",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "oaipmh",
     "extendsScheme": "",
     "syntax": "oaipmh:baseUrl",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/olingo2.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/olingo2.json
index f2757c11afa..f6728bac9d0 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/olingo2.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/olingo2.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-olingo2",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "olingo2",
     "extendsScheme": "",
     "syntax": "olingo2:apiName\/methodName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/olingo4.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/olingo4.json
index 2f4429c0074..6131d5452b2 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/olingo4.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/olingo4.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-olingo4",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "olingo4",
     "extendsScheme": "",
     "syntax": "olingo4:apiName\/methodName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openshift-build-configs.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openshift-build-configs.json
index 21a08c51071..24bebe93360 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openshift-build-configs.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openshift-build-configs.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-kubernetes",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "openshift-build-configs",
     "extendsScheme": "",
     "syntax": "openshift-build-configs:masterUrl",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openshift-builds.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openshift-builds.json
index 2e8d10b743c..fb758d966ae 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openshift-builds.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openshift-builds.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-kubernetes",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "openshift-builds",
     "extendsScheme": "",
     "syntax": "openshift-builds:masterUrl",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openshift-deploymentconfigs.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openshift-deploymentconfigs.json
index 101e7dd8257..72cf33b1c6a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openshift-deploymentconfigs.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openshift-deploymentconfigs.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-kubernetes",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "openshift-deploymentconfigs",
     "extendsScheme": "",
     "syntax": "openshift-deploymentconfigs:masterUrl",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-cinder.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-cinder.json
index 71219d25049..91e451ae87f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-cinder.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-cinder.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-openstack",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "openstack-cinder",
     "extendsScheme": "",
     "syntax": "openstack-cinder:host",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-glance.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-glance.json
index ee854cf2874..709b8ab9f70 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-glance.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-glance.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-openstack",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "openstack-glance",
     "extendsScheme": "",
     "syntax": "openstack-glance:host",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-keystone.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-keystone.json
index 5763096078d..68a79197de5 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-keystone.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-keystone.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-openstack",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "openstack-keystone",
     "extendsScheme": "",
     "syntax": "openstack-keystone:host",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-neutron.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-neutron.json
index d7521538a14..037db9b3c8f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-neutron.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-neutron.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-openstack",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "openstack-neutron",
     "extendsScheme": "",
     "syntax": "openstack-neutron:host",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-nova.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-nova.json
index a6ce39e7841..80e0eaa8005 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-nova.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-nova.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-openstack",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "openstack-nova",
     "extendsScheme": "",
     "syntax": "openstack-nova:host",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-swift.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-swift.json
index 093713a2ee5..59d0228e5ba 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-swift.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/openstack-swift.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-openstack",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "openstack-swift",
     "extendsScheme": "",
     "syntax": "openstack-swift:host",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/optaplanner.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/optaplanner.json
index 3706b6f1f23..09c1eb97780 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/optaplanner.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/optaplanner.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-optaplanner",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "optaplanner",
     "extendsScheme": "",
     "syntax": "optaplanner:configFile",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/paho-mqtt5.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/paho-mqtt5.json
index d266f302ec1..295482c2ce6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/paho-mqtt5.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/paho-mqtt5.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-paho-mqtt5",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "paho-mqtt5",
     "extendsScheme": "",
     "syntax": "paho-mqtt5:topic",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/paho.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/paho.json
index fac64cb158b..edfb2c6c88e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/paho.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/paho.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-paho",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "paho",
     "extendsScheme": "",
     "syntax": "paho:topic",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pdf.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pdf.json
index eb8aa385aa2..ff3a70bb070 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pdf.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pdf.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-pdf",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "pdf",
     "extendsScheme": "",
     "syntax": "pdf:operation",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pg-replication-slot.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pg-replication-slot.json
index 24fa66d2aab..5ce0a17c0c1 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pg-replication-slot.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pg-replication-slot.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-pg-replication-slot",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "pg-replication-slot",
     "extendsScheme": "",
     "syntax": "pg-replication-slot:host:port\/database\/slot:outputPlugin",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pgevent.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pgevent.json
index 55f24989d95..fcc7dd3cf2c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pgevent.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pgevent.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-pgevent",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "pgevent",
     "extendsScheme": "",
     "syntax": "pgevent:host:port\/database\/channel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/platform-http.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/platform-http.json
index b48a5f2fa93..74ece61b382 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/platform-http.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/platform-http.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-platform-http",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "platform-http",
     "extendsScheme": "",
     "syntax": "platform-http:path",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/plc4x.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/plc4x.json
index 67c4e12624b..4273821f200 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/plc4x.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/plc4x.json
@@ -11,7 +11,7 @@
     "supportLevel": "Preview",
     "groupId": "org.apache.camel",
     "artifactId": "camel-plc4x",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "plc4x",
     "extendsScheme": "",
     "syntax": "plc4x:driver",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pop3.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pop3.json
index 29aa0cfa91c..4768bb478e2 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pop3.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pop3.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-mail",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "pop3",
     "extendsScheme": "",
     "alternativeSchemes": "imap,imaps,pop3,pop3s,smtp,smtps",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pop3s.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pop3s.json
index 355bc25bf82..b156f6e1808 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pop3s.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pop3s.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-mail",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "pop3s",
     "extendsScheme": "",
     "alternativeSchemes": "imap,imaps,pop3,pop3s,smtp,smtps",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pubnub.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pubnub.json
index b4d3f7ba2d7..ab071bf687a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pubnub.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pubnub.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-pubnub",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "pubnub",
     "extendsScheme": "",
     "syntax": "pubnub:channel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pulsar.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pulsar.json
index 183bf83b416..351b6dad8b2 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pulsar.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pulsar.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-pulsar",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "pulsar",
     "extendsScheme": "",
     "syntax": "pulsar:persistence:\/\/tenant\/namespace\/topic",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/quartz.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/quartz.json
index 0e68944dba1..50a6ae06477 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/quartz.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/quartz.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-quartz",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "quartz",
     "extendsScheme": "",
     "syntax": "quartz:groupName\/triggerName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/quickfix.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/quickfix.json
index d153f31273b..a8e3f9a1d1e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/quickfix.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/quickfix.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-quickfix",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "quickfix",
     "extendsScheme": "",
     "syntax": "quickfix:configurationName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rabbitmq.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rabbitmq.json
index e9620c353bd..b8121ec5523 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rabbitmq.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rabbitmq.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-rabbitmq",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "rabbitmq",
     "extendsScheme": "",
     "syntax": "rabbitmq:exchangeName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/reactive-streams.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/reactive-streams.json
index a6d53b1adf4..070697ee0a7 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/reactive-streams.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/reactive-streams.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-reactive-streams",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "reactive-streams",
     "extendsScheme": "",
     "syntax": "reactive-streams:stream",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ref.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ref.json
index d7a232c0b79..2c232959249 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ref.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ref.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-ref",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "ref",
     "extendsScheme": "",
     "syntax": "ref:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-api.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-api.json
index 60326fd1b91..80b4cd02a9a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-api.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-api.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-rest",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "rest-api",
     "extendsScheme": "",
     "syntax": "rest-api:path",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-openapi.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-openapi.json
index dc23d608e3c..762a71af91a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-openapi.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-openapi.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-rest-openapi",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "rest-openapi",
     "extendsScheme": "",
     "syntax": "rest-openapi:specificationUri#operationId",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-swagger.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-swagger.json
index 81f4ea706ae..a8105709fa8 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-swagger.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-swagger.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-rest-swagger",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "rest-swagger",
     "extendsScheme": "",
     "syntax": "rest-swagger:specificationUri#operationId",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest.json
index 9281d4df5ff..5389d6333f6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-rest",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "rest",
     "extendsScheme": "",
     "syntax": "rest:method:path:uriTemplate",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/resteasy.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/resteasy.json
index 04aa5ba7183..628022ee6ed 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/resteasy.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/resteasy.json
@@ -12,7 +12,7 @@
     "supportLevel": "Preview",
     "groupId": "org.apache.camel",
     "artifactId": "camel-resteasy",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "resteasy",
     "extendsScheme": "http",
     "syntax": "resteasy:httpUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/robotframework.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/robotframework.json
index 2ed69317e74..d784fcbc7d0 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/robotframework.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/robotframework.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-robotframework",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "robotframework",
     "extendsScheme": "",
     "syntax": "robotframework:resourceUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rss.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rss.json
index 8182798a5e3..851c353df2a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rss.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rss.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-rss",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "rss",
     "extendsScheme": "atom",
     "syntax": "rss:feedUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/saga.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/saga.json
index 6a9c24633c6..4f572ff54fc 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/saga.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/saga.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-saga",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "saga",
     "extendsScheme": "",
     "syntax": "saga:action",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/salesforce.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/salesforce.json
index e278f1b6d6c..0975d8801a7 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/salesforce.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/salesforce.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-salesforce",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "salesforce",
     "extendsScheme": "",
     "syntax": "salesforce:operationName:topicName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sap-netweaver.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sap-netweaver.json
index eb8e4219af5..84728354ca4 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sap-netweaver.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sap-netweaver.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-sap-netweaver",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "sap-netweaver",
     "extendsScheme": "",
     "syntax": "sap-netweaver:url",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/scheduler.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/scheduler.json
index eddf7f8d3e0..a8d5c846a04 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/scheduler.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/scheduler.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-scheduler",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "scheduler",
     "extendsScheme": "",
     "syntax": "scheduler:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/schematron.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/schematron.json
index 1dad41a24bc..5aa730c713e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/schematron.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/schematron.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-schematron",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "schematron",
     "extendsScheme": "",
     "syntax": "schematron:path",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/scp.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/scp.json
index 64cd62afa6e..22b8eea4d0e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/scp.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/scp.json
@@ -12,7 +12,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jsch",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "scp",
     "extendsScheme": "ftp",
     "syntax": "scp:host:port\/directoryName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/seda.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/seda.json
index 4d4e10e3ccc..e355fdaebfb 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/seda.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/seda.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-seda",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "seda",
     "extendsScheme": "",
     "syntax": "seda:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/service.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/service.json
index 8194e700d8e..d6e5a119938 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/service.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/service.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-service",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "service",
     "extendsScheme": "",
     "syntax": "service:delegateUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/servicenow.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/servicenow.json
index 66a02712bc9..ae0ec7665eb 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/servicenow.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/servicenow.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-servicenow",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "servicenow",
     "extendsScheme": "",
     "syntax": "servicenow:instanceName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/servlet.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/servlet.json
index 2c85cb4a53c..2656d227f68 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/servlet.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/servlet.json
@@ -12,7 +12,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-servlet",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "servlet",
     "extendsScheme": "http",
     "syntax": "servlet:contextPath",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sftp.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sftp.json
index 9eec345c16b..57950cc9391 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sftp.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sftp.json
@@ -12,7 +12,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-ftp",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "sftp",
     "extendsScheme": "file",
     "syntax": "sftp:host:port\/directoryName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms.json
index 79b79b39d76..9c2663a4531 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-sjms",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "sjms",
     "extendsScheme": "",
     "syntax": "sjms:destinationType:destinationName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms2.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms2.json
index 278c35eee1f..5cd0b3e01ef 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms2.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms2.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-sjms2",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "sjms2",
     "extendsScheme": "sjms",
     "syntax": "sjms2:destinationType:destinationName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/slack.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/slack.json
index 7d564b396bc..3cfed02ea40 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/slack.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/slack.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-slack",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "slack",
     "extendsScheme": "",
     "syntax": "slack:channel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smpp.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smpp.json
index 38f9ce5578c..0654d6dad4e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smpp.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smpp.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-smpp",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "smpp",
     "extendsScheme": "",
     "alternativeSchemes": "smpp,smpps",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smpps.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smpps.json
index 207bf20f590..6d4c47d9fd7 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smpps.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smpps.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-smpp",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "smpps",
     "extendsScheme": "",
     "alternativeSchemes": "smpp,smpps",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smtp.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smtp.json
index c25b37273c8..ec590207494 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smtp.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smtp.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-mail",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "smtp",
     "extendsScheme": "",
     "alternativeSchemes": "imap,imaps,pop3,pop3s,smtp,smtps",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smtps.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smtps.json
index 9fbaeddd69f..e53f6b73076 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smtps.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smtps.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-mail",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "smtps",
     "extendsScheme": "",
     "alternativeSchemes": "imap,imaps,pop3,pop3s,smtp,smtps",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/snmp.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/snmp.json
index 73d52934a45..a4ade065a33 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/snmp.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/snmp.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-snmp",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "snmp",
     "extendsScheme": "",
     "syntax": "snmp:host:port",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/solr.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/solr.json
index 4e4f73803e6..0691c024dee 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/solr.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/solr.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-solr",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "solr",
     "extendsScheme": "",
     "alternativeSchemes": "solr,solrs,solrCloud",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/solrCloud.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/solrCloud.json
index 0291c9e1316..8a5b3edf6a4 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/solrCloud.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/solrCloud.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-solr",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "solrCloud",
     "extendsScheme": "",
     "alternativeSchemes": "solr,solrs,solrCloud",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/solrs.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/solrs.json
index e56b9c75ea5..805226a5be1 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/solrs.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/solrs.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-solr",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "solrs",
     "extendsScheme": "",
     "alternativeSchemes": "solr,solrs,solrCloud",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spark.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spark.json
index 4724f02cb42..dac32ff8cf3 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spark.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spark.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-spark",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "spark",
     "extendsScheme": "",
     "syntax": "spark:endpointType",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/splunk-hec.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/splunk-hec.json
index acb073ed6c7..a3af2063376 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/splunk-hec.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/splunk-hec.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-splunk-hec",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "splunk-hec",
     "extendsScheme": "",
     "syntax": "splunk-hec:splunkURL\/token",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/splunk.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/splunk.json
index 203ccd4eb88..5feb643be41 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/splunk.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/splunk.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-splunk",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "splunk",
     "extendsScheme": "",
     "syntax": "splunk:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-batch.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-batch.json
index 7d61cf8653f..f3ca128b1d8 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-batch.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-batch.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-spring-batch",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "spring-batch",
     "extendsScheme": "",
     "syntax": "spring-batch:jobName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-event.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-event.json
index 7f5a8f4e1bb..850a66925e6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-event.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-event.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-spring",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "spring-event",
     "extendsScheme": "",
     "syntax": "spring-event:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-integration.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-integration.json
index 5d933a8457a..ea2a95973b4 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-integration.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-integration.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-spring-integration",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "spring-integration",
     "extendsScheme": "",
     "syntax": "spring-integration:defaultChannel",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-jdbc.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-jdbc.json
index 6b89e4c22f5..2202ad58f7d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-jdbc.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-jdbc.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-spring-jdbc",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "spring-jdbc",
     "extendsScheme": "",
     "syntax": "spring-jdbc:dataSourceName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-ldap.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-ldap.json
index 269703b4662..4f6f9f569be 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-ldap.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-ldap.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-spring-ldap",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "spring-ldap",
     "extendsScheme": "",
     "syntax": "spring-ldap:templateName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-rabbitmq.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-rabbitmq.json
index b7b42a53cd3..1dbd0d0ebe0 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-rabbitmq.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-rabbitmq.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-spring-rabbitmq",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "spring-rabbitmq",
     "extendsScheme": "",
     "syntax": "spring-rabbitmq:exchangeName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-redis.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-redis.json
index b2d8970dedb..bab39426563 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-redis.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-redis.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-spring-redis",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "spring-redis",
     "extendsScheme": "",
     "syntax": "spring-redis:host:port",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-ws.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-ws.json
index b2288c0ce39..9f805ec8f51 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-ws.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-ws.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-spring-ws",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "spring-ws",
     "extendsScheme": "",
     "syntax": "spring-ws:type:lookupKey:webServiceEndpointUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sql-stored.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sql-stored.json
index 16a63841f34..e0ca125aaec 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sql-stored.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sql-stored.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-sql",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "sql-stored",
     "extendsScheme": "",
     "syntax": "sql-stored:template",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sql.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sql.json
index 73ee2593043..d581546eb78 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sql.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sql.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-sql",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "sql",
     "extendsScheme": "",
     "syntax": "sql:query",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ssh.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ssh.json
index e541da37916..42ea3c2fd4a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ssh.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ssh.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-ssh",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "ssh",
     "extendsScheme": "",
     "syntax": "ssh:host:port",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stax.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stax.json
index ae94ca46909..bb6b6a6f70a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stax.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stax.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-stax",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "stax",
     "extendsScheme": "",
     "syntax": "stax:contentHandlerClass",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stitch.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stitch.json
index 964a57993dc..e1dc614c3b2 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stitch.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stitch.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-stitch",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "stitch",
     "extendsScheme": "",
     "syntax": "stitch:tableName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stomp.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stomp.json
index 03a0242544d..73ffa9a94b6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stomp.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stomp.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-stomp",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "stomp",
     "extendsScheme": "",
     "syntax": "stomp:destination",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stream.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stream.json
index 9ce42fedbe4..eaef1e39987 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stream.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stream.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-stream",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "stream",
     "extendsScheme": "",
     "syntax": "stream:kind",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/string-template.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/string-template.json
index 89210a1de3e..fe9d5d0a418 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/string-template.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/string-template.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-stringtemplate",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "string-template",
     "extendsScheme": "",
     "syntax": "string-template:resourceUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stub.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stub.json
index 97174192e3e..7757009babf 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stub.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stub.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-stub",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "stub",
     "extendsScheme": "",
     "syntax": "stub:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/telegram.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/telegram.json
index abfbd3f0ec0..b387a23fa45 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/telegram.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/telegram.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-telegram",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "telegram",
     "extendsScheme": "",
     "syntax": "telegram:type",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/thrift.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/thrift.json
index d5bd07b1cb6..9926af0b08b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/thrift.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/thrift.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-thrift",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "thrift",
     "extendsScheme": "",
     "syntax": "thrift:host:port\/service",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/tika.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/tika.json
index a55b7025fa3..b485f5b2dbb 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/tika.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/tika.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-tika",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "tika",
     "extendsScheme": "",
     "syntax": "tika:operation",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/timer.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/timer.json
index 35db322a143..3f91bf9355b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/timer.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/timer.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-timer",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "timer",
     "extendsScheme": "",
     "syntax": "timer:timerName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twilio.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twilio.json
index b6d12a1b020..945e3c49770 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twilio.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twilio.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-twilio",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "twilio",
     "extendsScheme": "",
     "syntax": "twilio:apiName\/methodName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twitter-directmessage.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twitter-directmessage.json
index c13648e5e6a..1905b1f2e16 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twitter-directmessage.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twitter-directmessage.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-twitter",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "twitter-directmessage",
     "extendsScheme": "",
     "syntax": "twitter-directmessage:user",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twitter-search.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twitter-search.json
index 415f7492dde..10457c7483c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twitter-search.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twitter-search.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-twitter",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "twitter-search",
     "extendsScheme": "",
     "syntax": "twitter-search:keywords",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twitter-timeline.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twitter-timeline.json
index c8e8abc054f..980eb12d065 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twitter-timeline.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/twitter-timeline.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-twitter",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "twitter-timeline",
     "extendsScheme": "",
     "syntax": "twitter-timeline:timelineType",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/undertow.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/undertow.json
index fae023fd1a6..f67ab69a933 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/undertow.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/undertow.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-undertow",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "undertow",
     "extendsScheme": "",
     "syntax": "undertow:httpURI",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/validator.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/validator.json
index 40b520d054c..18f87c8e578 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/validator.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/validator.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-validator",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "validator",
     "extendsScheme": "",
     "syntax": "validator:resourceUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/velocity.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/velocity.json
index f426d2e64de..d4970fc8a05 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/velocity.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/velocity.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-velocity",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "velocity",
     "extendsScheme": "",
     "syntax": "velocity:resourceUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-http.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-http.json
index cc06fbafaf0..ba634b04868 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-http.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-http.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-vertx-http",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "vertx-http",
     "extendsScheme": "",
     "syntax": "vertx-http:httpUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-kafka.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-kafka.json
index 57492acb496..d75f0107cc7 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-kafka.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-kafka.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-vertx-kafka",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "vertx-kafka",
     "extendsScheme": "",
     "syntax": "vertx-kafka:topic",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-websocket.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-websocket.json
index a11c1c95037..f0f86b21bc7 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-websocket.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-websocket.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-vertx-websocket",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "vertx-websocket",
     "extendsScheme": "",
     "syntax": "vertx-websocket:host:port\/path",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx.json
index fbe2712ba24..7bb5bc45064 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-vertx",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "vertx",
     "extendsScheme": "",
     "syntax": "vertx:address",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vm.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vm.json
index 44fcb794e98..6763ad976e7 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vm.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vm.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-vm",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "vm",
     "extendsScheme": "",
     "syntax": "vm:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/weather.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/weather.json
index 3ccd5ff5e3e..375bc93e75b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/weather.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/weather.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-weather",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "weather",
     "extendsScheme": "",
     "syntax": "weather:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/web3j.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/web3j.json
index 658a8dc8966..3c52b101b4f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/web3j.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/web3j.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-web3j",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "web3j",
     "extendsScheme": "",
     "syntax": "web3j:nodeAddress",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/webhook.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/webhook.json
index b33d39ab2b1..066e3172514 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/webhook.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/webhook.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-webhook",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "webhook",
     "extendsScheme": "",
     "syntax": "webhook:endpointUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/websocket-jsr356.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/websocket-jsr356.json
index 858b6a4031f..7647f585ef7 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/websocket-jsr356.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/websocket-jsr356.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-websocket-jsr356",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "websocket-jsr356",
     "extendsScheme": "",
     "syntax": "websocket-jsr356:uri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/websocket.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/websocket.json
index e5aa6c1411d..0f84582c074 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/websocket.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/websocket.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-websocket",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "websocket",
     "extendsScheme": "",
     "syntax": "websocket:host:port\/resourceUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/weka.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/weka.json
index e166f7380ed..cb672432401 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/weka.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/weka.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-weka",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "weka",
     "extendsScheme": "",
     "syntax": "weka:command",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/whatsapp.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/whatsapp.json
index 7b8dc51a1e7..492d55f347c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/whatsapp.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/whatsapp.json
@@ -11,7 +11,7 @@
     "supportLevel": "Preview",
     "groupId": "org.apache.camel",
     "artifactId": "camel-whatsapp",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "whatsapp",
     "extendsScheme": "",
     "syntax": "whatsapp:phoneNumberId",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/wordpress.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/wordpress.json
index c09175f3c99..897c504d020 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/wordpress.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/wordpress.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-wordpress",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "wordpress",
     "extendsScheme": "",
     "syntax": "wordpress:operation",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/workday.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/workday.json
index 86e87e35baf..3898e573953 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/workday.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/workday.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-workday",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "workday",
     "extendsScheme": "",
     "syntax": "workday:entity:path",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xchange.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xchange.json
index 6bbbb3abf5e..e4054aac16b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xchange.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xchange.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-xchange",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "xchange",
     "extendsScheme": "",
     "syntax": "xchange:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xj.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xj.json
index f976d5056bd..4e17b5c5229 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xj.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xj.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-xj",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "xj",
     "extendsScheme": "",
     "syntax": "xj:resourceUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xmlsecurity-sign.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xmlsecurity-sign.json
index 1ce2f8f806a..95b4c6f0f86 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xmlsecurity-sign.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xmlsecurity-sign.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-xmlsecurity",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "xmlsecurity-sign",
     "extendsScheme": "",
     "syntax": "xmlsecurity-sign:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xmlsecurity-verify.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xmlsecurity-verify.json
index e09325fc0a0..36a4cc02dc3 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xmlsecurity-verify.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xmlsecurity-verify.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-xmlsecurity",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "xmlsecurity-verify",
     "extendsScheme": "",
     "syntax": "xmlsecurity-verify:name",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xmpp.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xmpp.json
index f8e631361a3..80fa0dec038 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xmpp.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xmpp.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-xmpp",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "xmpp",
     "extendsScheme": "",
     "syntax": "xmpp:host:port\/participant",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xquery.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xquery.json
index 1de5d5a2e74..7f13b2831e3 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xquery.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xquery.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-saxon",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "xquery",
     "extendsScheme": "",
     "syntax": "xquery:resourceUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xslt-saxon.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xslt-saxon.json
index 769331117e8..73b166aa2c6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xslt-saxon.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xslt-saxon.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-xslt-saxon",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "xslt-saxon",
     "extendsScheme": "",
     "syntax": "xslt-saxon:resourceUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xslt.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xslt.json
index 7d4694a766e..0f0a1647298 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xslt.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/xslt.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-xslt",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "xslt",
     "extendsScheme": "",
     "syntax": "xslt:resourceUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/zendesk.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/zendesk.json
index eee5eb183ac..8b7130a11c0 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/zendesk.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/zendesk.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-zendesk",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "zendesk",
     "extendsScheme": "",
     "syntax": "zendesk:methodName",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/zookeeper-master.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/zookeeper-master.json
index dd7f33a2a66..4abc71ef1d2 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/zookeeper-master.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/zookeeper-master.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-zookeeper-master",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "zookeeper-master",
     "extendsScheme": "",
     "syntax": "zookeeper-master:groupName:consumerEndpointUri",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/zookeeper.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/zookeeper.json
index 2e39414fbad..1e7ec695f22 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/zookeeper.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/zookeeper.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-zookeeper",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "zookeeper",
     "extendsScheme": "",
     "syntax": "zookeeper:serverUrls\/path",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/any23.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/any23.json
index 4a433599433..8f670f181c9 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/any23.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/any23.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-any23",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "any23",
     "modelJavaType": "org.apache.camel.model.dataformat.Any23DataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/asn1.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/asn1.json
index f52a58b4efb..86588d15274 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/asn1.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/asn1.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-asn1",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "asn1",
     "modelJavaType": "org.apache.camel.model.dataformat.ASN1DataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/avro.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/avro.json
index d743534e336..cf65ec3341c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/avro.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/avro.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-avro",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "avro",
     "modelJavaType": "org.apache.camel.model.dataformat.AvroDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/avroJackson.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/avroJackson.json
index 5b7eb9ec2ed..a3faf89639b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/avroJackson.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/avroJackson.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jackson-avro",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "avro",
     "modelJavaType": "org.apache.camel.model.dataformat.AvroDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/barcode.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/barcode.json
index d4e7c486a77..4c47f535c4c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/barcode.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/barcode.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-barcode",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "barcode",
     "modelJavaType": "org.apache.camel.model.dataformat.BarcodeDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/base64.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/base64.json
index 688ece6977e..e2b7066bfbf 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/base64.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/base64.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-base64",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "base64",
     "modelJavaType": "org.apache.camel.model.dataformat.Base64DataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindyCsv.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindyCsv.json
index ca6566842b9..57d1005f043 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindyCsv.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindyCsv.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-bindy",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "bindy",
     "modelJavaType": "org.apache.camel.model.dataformat.BindyDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindyFixed.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindyFixed.json
index b811e5bc971..603d30f44d3 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindyFixed.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindyFixed.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-bindy",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "bindy",
     "modelJavaType": "org.apache.camel.model.dataformat.BindyDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindyKvp.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindyKvp.json
index 3b07d0be712..02e629aaa25 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindyKvp.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/bindyKvp.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-bindy",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "bindy",
     "modelJavaType": "org.apache.camel.model.dataformat.BindyDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/cbor.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/cbor.json
index 6556e12ff1b..4206a1e00bc 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/cbor.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/cbor.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-cbor",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "cbor",
     "modelJavaType": "org.apache.camel.model.dataformat.CBORDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/crypto.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/crypto.json
index 2c30aa48a99..206ffd27787 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/crypto.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/crypto.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-crypto",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "crypto",
     "modelJavaType": "org.apache.camel.model.dataformat.CryptoDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/csv.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/csv.json
index 9f86814c04d..d694152da40 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/csv.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/csv.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-csv",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "csv",
     "modelJavaType": "org.apache.camel.model.dataformat.CsvDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/fastjson.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/fastjson.json
index 1257ddaf3b1..a52c00b64d4 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/fastjson.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/fastjson.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-fastjson",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "json",
     "modelJavaType": "org.apache.camel.model.dataformat.JsonDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/fhirJson.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/fhirJson.json
index 5cd41d07700..980e6c21c11 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/fhirJson.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/fhirJson.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-fhir",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "fhirJson",
     "modelJavaType": "org.apache.camel.model.dataformat.FhirJsonDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/fhirXml.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/fhirXml.json
index e13a9bef610..593f4440a7c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/fhirXml.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/fhirXml.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-fhir",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "fhirXml",
     "modelJavaType": "org.apache.camel.model.dataformat.FhirXmlDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/flatpack.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/flatpack.json
index e24d2dae495..dd8ff99fa44 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/flatpack.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/flatpack.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-flatpack",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "flatpack",
     "modelJavaType": "org.apache.camel.model.dataformat.FlatpackDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/grok.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/grok.json
index 872c207808b..6b19e61bd41 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/grok.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/grok.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-grok",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "grok",
     "modelJavaType": "org.apache.camel.model.dataformat.GrokDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/gson.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/gson.json
index 1d03f5bbd74..213235cab00 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/gson.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/gson.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-gson",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "json",
     "modelJavaType": "org.apache.camel.model.dataformat.JsonDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/gzipDeflater.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/gzipDeflater.json
index 89131667322..751c4f03eb2 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/gzipDeflater.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/gzipDeflater.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-zip-deflater",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "gzipDeflater",
     "modelJavaType": "org.apache.camel.model.dataformat.GzipDeflaterDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/hl7.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/hl7.json
index 71a29d6bd54..6d94fb9948f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/hl7.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/hl7.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-hl7",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "hl7",
     "modelJavaType": "org.apache.camel.model.dataformat.HL7DataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/ical.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/ical.json
index 8ee006ca1df..95bdb7d88df 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/ical.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/ical.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-ical",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "ical",
     "modelJavaType": "org.apache.camel.model.dataformat.IcalDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jackson.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jackson.json
index 21b11c33937..60a19f907ee 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jackson.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jackson.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jackson",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "json",
     "modelJavaType": "org.apache.camel.model.dataformat.JsonDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jacksonXml.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jacksonXml.json
index 73f12765b37..323ec431993 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jacksonXml.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jacksonXml.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jacksonxml",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "jacksonXml",
     "modelJavaType": "org.apache.camel.model.dataformat.JacksonXMLDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jaxb.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jaxb.json
index 5cd3241699e..40c7fd20848 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jaxb.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jaxb.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jaxb",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "jaxb",
     "modelJavaType": "org.apache.camel.model.dataformat.JaxbDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/johnzon.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/johnzon.json
index 1d5234ccb76..5013f44f44d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/johnzon.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/johnzon.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-johnzon",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "json",
     "modelJavaType": "org.apache.camel.model.dataformat.JsonDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jsonApi.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jsonApi.json
index b0f64d8c993..e7735a9948a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jsonApi.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jsonApi.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jsonapi",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "jsonApi",
     "modelJavaType": "org.apache.camel.model.dataformat.JsonApiDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jsonb.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jsonb.json
index 9bf3e26937c..753b133ba15 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jsonb.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jsonb.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jsonb",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "json",
     "modelJavaType": "org.apache.camel.model.dataformat.JsonDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/lzf.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/lzf.json
index 6e6996a55e1..fba071e7aaf 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/lzf.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/lzf.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-lzf",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "lzf",
     "modelJavaType": "org.apache.camel.model.dataformat.LZFDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/mimeMultipart.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/mimeMultipart.json
index 0303ca899d6..d9893bbd4fb 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/mimeMultipart.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/mimeMultipart.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-mail",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "mimeMultipart",
     "modelJavaType": "org.apache.camel.model.dataformat.MimeMultipartDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/pgp.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/pgp.json
index 5a3f10a6300..b5619df9c65 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/pgp.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/pgp.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-crypto",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "pgp",
     "modelJavaType": "org.apache.camel.model.dataformat.PGPDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/protobuf.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/protobuf.json
index 9e4072f3c7f..9b42df62556 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/protobuf.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/protobuf.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-protobuf",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "protobuf",
     "modelJavaType": "org.apache.camel.model.dataformat.ProtobufDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/protobufJackson.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/protobufJackson.json
index 95f8ba83207..1b872236896 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/protobufJackson.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/protobufJackson.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jackson-protobuf",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "protobuf",
     "modelJavaType": "org.apache.camel.model.dataformat.ProtobufDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/rss.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/rss.json
index e5a876b0981..d2c1a500419 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/rss.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/rss.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-rss",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "rss",
     "modelJavaType": "org.apache.camel.model.dataformat.RssDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/snakeYaml.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/snakeYaml.json
index 45d4c5aa67b..aae75195bfa 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/snakeYaml.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/snakeYaml.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-snakeyaml",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "yaml",
     "modelJavaType": "org.apache.camel.model.dataformat.YAMLDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/soap.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/soap.json
index 76a7d54cdd3..fa66b5972e1 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/soap.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/soap.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-soap",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "soap",
     "modelJavaType": "org.apache.camel.model.dataformat.SoapDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/swiftMt.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/swiftMt.json
index 7d532e1bbcc..15103fc553e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/swiftMt.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/swiftMt.json
@@ -11,7 +11,7 @@
     "supportLevel": "Preview",
     "groupId": "org.apache.camel",
     "artifactId": "camel-swift",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "swiftMt",
     "modelJavaType": "org.apache.camel.model.dataformat.SwiftMtDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/swiftMx.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/swiftMx.json
index 2be3dbd40ff..91d1a7a77c6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/swiftMx.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/swiftMx.json
@@ -11,7 +11,7 @@
     "supportLevel": "Preview",
     "groupId": "org.apache.camel",
     "artifactId": "camel-swift",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "swiftMx",
     "modelJavaType": "org.apache.camel.model.dataformat.SwiftMxDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/syslog.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/syslog.json
index 02e968c568a..0f76019218d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/syslog.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/syslog.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-syslog",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "syslog",
     "modelJavaType": "org.apache.camel.model.dataformat.SyslogDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/tarFile.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/tarFile.json
index b3022d94057..ee158866a1b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/tarFile.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/tarFile.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-tarfile",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "tarFile",
     "modelJavaType": "org.apache.camel.model.dataformat.TarFileDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/thrift.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/thrift.json
index 4d81721892c..3cf507529d5 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/thrift.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/thrift.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-thrift",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "thrift",
     "modelJavaType": "org.apache.camel.model.dataformat.ThriftDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/univocityCsv.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/univocityCsv.json
index cafa1b6ef8a..def2e032c28 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/univocityCsv.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/univocityCsv.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-univocity-parsers",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "univocityCsv",
     "modelJavaType": "org.apache.camel.model.dataformat.UniVocityCsvDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/univocityFixed.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/univocityFixed.json
index 55b60d5afaf..b08b27285d5 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/univocityFixed.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/univocityFixed.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-univocity-parsers",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "univocityFixed",
     "modelJavaType": "org.apache.camel.model.dataformat.UniVocityFixedDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/univocityTsv.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/univocityTsv.json
index 07bb5bba9b1..f3798777623 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/univocityTsv.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/univocityTsv.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-univocity-parsers",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "univocityTsv",
     "modelJavaType": "org.apache.camel.model.dataformat.UniVocityTsvDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/xmlSecurity.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/xmlSecurity.json
index 72dcd94a655..408c366b5be 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/xmlSecurity.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/xmlSecurity.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-xmlsecurity",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "xmlSecurity",
     "modelJavaType": "org.apache.camel.model.dataformat.XMLSecurityDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/xstream.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/xstream.json
index 709b7da4c30..263660500c4 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/xstream.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/xstream.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-xstream",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "xstream",
     "modelJavaType": "org.apache.camel.model.dataformat.XStreamDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/xstreamJson.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/xstreamJson.json
index 72a1b0ae068..14071cb459c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/xstreamJson.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/xstreamJson.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-xstream",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "json",
     "modelJavaType": "org.apache.camel.model.dataformat.JsonDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/zipDeflater.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/zipDeflater.json
index 09e6b1bd492..d73a56c9bae 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/zipDeflater.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/zipDeflater.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-zip-deflater",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "zipDeflater",
     "modelJavaType": "org.apache.camel.model.dataformat.ZipDeflaterDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/zipFile.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/zipFile.json
index 3257cc578d9..629392278f4 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/zipFile.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/zipFile.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-zipfile",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "zipFile",
     "modelJavaType": "org.apache.camel.model.dataformat.ZipFileDataFormat"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/bean.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/bean.json
index 7824135b146..2b2228b31c4 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/bean.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/bean.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-bean",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "method",
     "modelJavaType": "org.apache.camel.model.language.MethodCallExpression"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/constant.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/constant.json
index 05a3f15472e..923bd36082d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/constant.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/constant.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-core-languages",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "constant",
     "modelJavaType": "org.apache.camel.model.language.ConstantExpression"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/csimple.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/csimple.json
index 670544fe1ba..51e2c3b7298 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/csimple.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/csimple.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-core-languages",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "csimple",
     "modelJavaType": "org.apache.camel.model.language.CSimpleExpression"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/datasonnet.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/datasonnet.json
index f8265569dc2..4b7f41e6e4c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/datasonnet.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/datasonnet.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-datasonnet",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "datasonnet",
     "modelJavaType": "org.apache.camel.model.language.DatasonnetExpression"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/exchangeProperty.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/exchangeProperty.json
index 27ffd18fe9d..31af43b649c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/exchangeProperty.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/exchangeProperty.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-core-languages",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "exchangeProperty",
     "modelJavaType": "org.apache.camel.model.language.ExchangePropertyExpression"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/file.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/file.json
index 03ec90d88f8..51d6871cc8c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/file.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/file.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-core-languages",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "simple",
     "modelJavaType": "org.apache.camel.model.language.SimpleExpression"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/groovy.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/groovy.json
index 5681e2bb910..ae36c56761e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/groovy.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/groovy.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-groovy",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "groovy",
     "modelJavaType": "org.apache.camel.model.language.GroovyExpression"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/header.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/header.json
index 9bf779e704b..1d1e6d530cc 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/header.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/header.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-core-languages",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "header",
     "modelJavaType": "org.apache.camel.model.language.HeaderExpression"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/hl7terser.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/hl7terser.json
index 9dca6cfdf54..40b7d1f514c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/hl7terser.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/hl7terser.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-hl7",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "hl7terser",
     "modelJavaType": "org.apache.camel.model.language.Hl7TerserExpression"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/joor.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/joor.json
index 53a784187b0..e33801354c0 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/joor.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/joor.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-joor",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "joor",
     "modelJavaType": "org.apache.camel.model.language.JoorExpression"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/jq.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/jq.json
index e303c17c7e2..f1966da7afa 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/jq.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/jq.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jq",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "jq",
     "modelJavaType": "org.apache.camel.model.language.JqExpression"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/js.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/js.json
index 07ee11fd74a..ce4af359887 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/js.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/js.json
@@ -11,7 +11,7 @@
     "supportLevel": "Preview",
     "groupId": "org.apache.camel",
     "artifactId": "camel-javascript",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "js",
     "modelJavaType": "org.apache.camel.model.language.JavaScriptExpression"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/jsonpath.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/jsonpath.json
index 294055727ad..3549d3335e4 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/jsonpath.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/jsonpath.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jsonpath",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "jsonpath",
     "modelJavaType": "org.apache.camel.model.language.JsonPathExpression"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/mvel.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/mvel.json
index 5e7e9b3c7dd..cf42eef8280 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/mvel.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/mvel.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-mvel",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "mvel",
     "modelJavaType": "org.apache.camel.model.language.MvelExpression"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/ognl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/ognl.json
index ff3928f6706..36103b3af65 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/ognl.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/ognl.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-ognl",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "ognl",
     "modelJavaType": "org.apache.camel.model.language.OgnlExpression"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/python.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/python.json
index 59848f8a877..a3b80971546 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/python.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/python.json
@@ -11,7 +11,7 @@
     "supportLevel": "Experimental",
     "groupId": "org.apache.camel",
     "artifactId": "camel-python",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "python",
     "modelJavaType": "org.apache.camel.model.language.PythonExpression"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/ref.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/ref.json
index f64dbf6cc6a..5550659dfac 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/ref.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/ref.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-core-languages",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "ref",
     "modelJavaType": "org.apache.camel.model.language.RefExpression"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/simple.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/simple.json
index d50872d4bbb..b50bd6bc41b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/simple.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/simple.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-core-languages",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "simple",
     "modelJavaType": "org.apache.camel.model.language.SimpleExpression"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/spel.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/spel.json
index 0b24c3a9c89..2d8e2675f45 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/spel.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/spel.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-spring",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "spel",
     "modelJavaType": "org.apache.camel.model.language.SpELExpression"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/tokenize.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/tokenize.json
index db8ecd8327d..129a79f3f1e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/tokenize.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/tokenize.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-core-languages",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "tokenize",
     "modelJavaType": "org.apache.camel.model.language.TokenizerExpression"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/xpath.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/xpath.json
index b838176c688..7327db1429b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/xpath.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/xpath.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-xpath",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "xpath",
     "modelJavaType": "org.apache.camel.model.language.XPathExpression"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/xquery.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/xquery.json
index 55fa7afd886..bcaf6a51996 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/xquery.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/xquery.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-saxon",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "xquery",
     "modelJavaType": "org.apache.camel.model.language.XQueryExpression"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/xtokenize.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/xtokenize.json
index a0dade2fac7..a28a493533e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/xtokenize.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/xtokenize.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-stax",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "xtokenize",
     "modelJavaType": "org.apache.camel.model.language.XMLTokenizerExpression"
   },
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/attachments.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/attachments.json
index f128290248f..e83342fa7c0 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/attachments.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/attachments.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-attachments",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/aws-xray.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/aws-xray.json
index 64c1691161a..c220c23f8a3 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/aws-xray.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/aws-xray.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws-xray",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/caffeine-lrucache.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/caffeine-lrucache.json
index aa96d1b8991..5792360bbd7 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/caffeine-lrucache.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/caffeine-lrucache.json
@@ -11,6 +11,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-caffeine-lrucache",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cdi-jta.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cdi-jta.json
index 085a1ac433e..ea6bc00dd9e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cdi-jta.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cdi-jta.json
@@ -10,6 +10,6 @@
     "supportLevel": "Preview",
     "groupId": "org.apache.camel",
     "artifactId": "camel-cdi-jta",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cdi-main.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cdi-main.json
index ef316737c43..83bd96e1aae 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cdi-main.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cdi-main.json
@@ -10,6 +10,6 @@
     "supportLevel": "Preview",
     "groupId": "org.apache.camel",
     "artifactId": "camel-cdi-main",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cdi.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cdi.json
index 8961b289a64..cb418dbe831 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cdi.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cdi.json
@@ -10,6 +10,6 @@
     "supportLevel": "Preview",
     "groupId": "org.apache.camel",
     "artifactId": "camel-cdi",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cli-connector.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cli-connector.json
index 1cb9bbb65c9..1fa5071091d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cli-connector.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cli-connector.json
@@ -10,6 +10,6 @@
     "supportLevel": "Preview",
     "groupId": "org.apache.camel",
     "artifactId": "camel-cli-connector",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cloud.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cloud.json
index 4bb33c27e9a..7012c24e217 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cloud.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cloud.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-cloud",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cloudevents.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cloudevents.json
index b7ff381287e..18716866310 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cloudevents.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cloudevents.json
@@ -9,6 +9,6 @@
     "supportLevel": "Preview",
     "groupId": "org.apache.camel",
     "artifactId": "camel-cloudevents",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cluster.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cluster.json
index 99fd45b0786..8ef6d2c7fb9 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cluster.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cluster.json
@@ -10,6 +10,6 @@
     "supportLevel": "Preview",
     "groupId": "org.apache.camel",
     "artifactId": "camel-cluster",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/componentdsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/componentdsl.json
index b6b60236da0..3799e772735 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/componentdsl.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/componentdsl.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-componentdsl",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json
index 99c39728c6c..ce7a881c163 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-console",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/csimple-joor.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/csimple-joor.json
index 73d1af7bb7d..7a5dc4574f0 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/csimple-joor.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/csimple-joor.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-csimple-joor",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/debug.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/debug.json
index 25f185c172c..427a293e413 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/debug.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/debug.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-debug",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/dsl-modeline.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/dsl-modeline.json
index 892c11241e3..6fa278ea075 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/dsl-modeline.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/dsl-modeline.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-dsl-modeline",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/dsl-support.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/dsl-support.json
index e38122f5793..b4fbba40983 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/dsl-support.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/dsl-support.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-dsl-support",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/elytron.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/elytron.json
index 6fc45cfd71e..45feff0326d 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/elytron.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/elytron.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-elytron",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/endpointdsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/endpointdsl.json
index 7f25d35903a..cea1951ad69 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/endpointdsl.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/endpointdsl.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-endpointdsl",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/groovy-dsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/groovy-dsl.json
index be3278f4797..05aba580247 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/groovy-dsl.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/groovy-dsl.json
@@ -10,6 +10,6 @@
     "supportLevel": "Experimental",
     "groupId": "org.apache.camel",
     "artifactId": "camel-groovy-dsl",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/headersmap.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/headersmap.json
index f57641aa86f..3a6ce12097e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/headersmap.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/headersmap.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-headersmap",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/health.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/health.json
index 98a6ddea46c..ca46299b4e4 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/health.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/health.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-health",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jasypt.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jasypt.json
index 93edfd45d8d..abc6c113a6b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jasypt.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jasypt.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jasypt",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/java-joor-dsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/java-joor-dsl.json
index 78e4f1db8f1..aad7ab45cb9 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/java-joor-dsl.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/java-joor-dsl.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-java-joor-dsl",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jfr.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jfr.json
index 4d82fc5ff21..5ba57105384 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jfr.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jfr.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jfr",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/js-dsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/js-dsl.json
index 7da5abfe6f2..158781eca03 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/js-dsl.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/js-dsl.json
@@ -10,6 +10,6 @@
     "supportLevel": "Experimental",
     "groupId": "org.apache.camel",
     "artifactId": "camel-js-dsl",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jsh-dsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jsh-dsl.json
index 9a6e8efd5a5..a8013087c26 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jsh-dsl.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jsh-dsl.json
@@ -10,6 +10,6 @@
     "supportLevel": "Experimental",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jsh-dsl",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jta.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jta.json
index 1332ffa6a50..b6b3def50ea 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jta.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jta.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jta",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kamelet-main.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kamelet-main.json
index 06c94fc5b31..a60684f90ff 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kamelet-main.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kamelet-main.json
@@ -10,6 +10,6 @@
     "supportLevel": "Preview",
     "groupId": "org.apache.camel",
     "artifactId": "camel-kamelet-main",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kotlin-dsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kotlin-dsl.json
index 3fe9d0a3b2f..d219f8cb05f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kotlin-dsl.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kotlin-dsl.json
@@ -10,6 +10,6 @@
     "supportLevel": "Experimental",
     "groupId": "org.apache.camel",
     "artifactId": "camel-kotlin-dsl",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/leveldb.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/leveldb.json
index 925dd7fbfcc..9e5995c00fa 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/leveldb.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/leveldb.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-leveldb",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/lra.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/lra.json
index e34ffc159aa..ea02cb24f05 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/lra.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/lra.json
@@ -10,6 +10,6 @@
     "supportLevel": "Preview",
     "groupId": "org.apache.camel",
     "artifactId": "camel-lra",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/mail-microsoft-oauth.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/mail-microsoft-oauth.json
index f72e889ff48..f8cffafc951 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/mail-microsoft-oauth.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/mail-microsoft-oauth.json
@@ -9,6 +9,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-mail-microsoft-oauth",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/main.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/main.json
index 03519892cb3..1d14d015aca 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/main.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/main.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-main",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/management.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/management.json
index 712491e6698..a60ef51e956 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/management.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/management.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-management",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/microprofile-config.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/microprofile-config.json
index 18e81119ced..207c3e87eca 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/microprofile-config.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/microprofile-config.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-microprofile-config",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/microprofile-fault-tolerance.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/microprofile-fault-tolerance.json
index de7b995613e..a931c4589b6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/microprofile-fault-tolerance.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/microprofile-fault-tolerance.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-microprofile-fault-tolerance",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/microprofile-health.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/microprofile-health.json
index 06ea8041326..7e62ef7be40 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/microprofile-health.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/microprofile-health.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-microprofile-health",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/openapi-java.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/openapi-java.json
index 0a67fc262b8..79e830dd99e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/openapi-java.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/openapi-java.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-openapi-java",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/opentelemetry.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/opentelemetry.json
index 08ff4e6c587..7ba9a109840 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/opentelemetry.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/opentelemetry.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-opentelemetry",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/opentracing.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/opentracing.json
index 279bcf1737f..3e2786207ff 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/opentracing.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/opentracing.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-opentracing",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/platform-http-vertx.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/platform-http-vertx.json
index 64badfef536..52fb1d5a599 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/platform-http-vertx.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/platform-http-vertx.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-platform-http-vertx",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/reactive-executor-tomcat.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/reactive-executor-tomcat.json
index 6e72da1e446..7505bb2a027 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/reactive-executor-tomcat.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/reactive-executor-tomcat.json
@@ -10,6 +10,6 @@
     "supportLevel": "Experimental",
     "groupId": "org.apache.camel",
     "artifactId": "camel-reactive-executor-tomcat",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/reactive-executor-vertx.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/reactive-executor-vertx.json
index 5b32be58aca..d5ff409ae90 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/reactive-executor-vertx.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/reactive-executor-vertx.json
@@ -10,6 +10,6 @@
     "supportLevel": "Experimental",
     "groupId": "org.apache.camel",
     "artifactId": "camel-reactive-executor-vertx",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/reactor.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/reactor.json
index 35f9acc12f7..c2daea1195b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/reactor.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/reactor.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-reactor",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/redis.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/redis.json
index 18d1053030f..eb1e936fac1 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/redis.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/redis.json
@@ -10,6 +10,6 @@
     "supportLevel": "Preview",
     "groupId": "org.apache.camel",
     "artifactId": "camel-redis",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/resilience4j.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/resilience4j.json
index 66f9cde5e56..2d19ae57c10 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/resilience4j.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/resilience4j.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-resilience4j",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/resourceresolver-github.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/resourceresolver-github.json
index b08013eadd1..4f5f5f9e3b0 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/resourceresolver-github.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/resourceresolver-github.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-resourceresolver-github",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/rxjava.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/rxjava.json
index d653d45077f..ecef26b078c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/rxjava.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/rxjava.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-rxjava",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/shiro.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/shiro.json
index c03dc4a542c..aa10295f7df 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/shiro.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/shiro.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-shiro",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/spring-main.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/spring-main.json
index 436526fddcb..c66574d9991 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/spring-main.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/spring-main.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-spring-main",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/spring-security.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/spring-security.json
index 704ce0b6ea6..601f104b53c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/spring-security.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/spring-security.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-spring-security",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/spring-xml.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/spring-xml.json
index 654a8fcf8b8..71548d7e4e3 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/spring-xml.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/spring-xml.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-spring-xml",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/swagger-java.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/swagger-java.json
index d1aa5b06b26..3c1b50503a6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/swagger-java.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/swagger-java.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-swagger-java",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-cdi.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-cdi.json
index ae0f5956362..e7ac91b1d89 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-cdi.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-cdi.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-test-cdi",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-junit5.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-junit5.json
index 516aac5a892..e0b00cc82ff 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-junit5.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-junit5.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-test-junit5",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-spring-junit5.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-spring-junit5.json
index 2f0e22c245a..11b9fc9f57a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-spring-junit5.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-spring-junit5.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-test-spring-junit5",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-spring.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-spring.json
index 687972f1fa3..fac5f43e08c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-spring.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-spring.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-test-spring",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/threadpoolfactory-vertx.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/threadpoolfactory-vertx.json
index 69e2352bfdc..3e25c2a36fe 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/threadpoolfactory-vertx.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/threadpoolfactory-vertx.json
@@ -10,6 +10,6 @@
     "supportLevel": "Preview",
     "groupId": "org.apache.camel",
     "artifactId": "camel-threadpoolfactory-vertx",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/tracing.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/tracing.json
index d1ad87acda5..60795c4a618 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/tracing.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/tracing.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-tracing",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/undertow-spring-security.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/undertow-spring-security.json
index 44339a3b683..90541731651 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/undertow-spring-security.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/undertow-spring-security.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-undertow-spring-security",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/wal.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/wal.json
index 6cbda8ec5d0..24831f693e0 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/wal.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/wal.json
@@ -10,6 +10,6 @@
     "supportLevel": "Preview",
     "groupId": "org.apache.camel",
     "artifactId": "camel-wal",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/xml-io-dsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/xml-io-dsl.json
index d44e7fcc075..922aff76646 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/xml-io-dsl.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/xml-io-dsl.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-xml-io-dsl",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/xml-jaxb-dsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/xml-jaxb-dsl.json
index cf1cb49ef63..76cf94b50a1 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/xml-jaxb-dsl.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/xml-jaxb-dsl.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-xml-jaxb-dsl",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/yaml-dsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/yaml-dsl.json
index a23888d2a73..cacc4392972 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/yaml-dsl.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/yaml-dsl.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-yaml-dsl",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/zipkin.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/zipkin.json
index 205027e5780..cad3f851de6 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/zipkin.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/zipkin.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-zipkin",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/catalog/camel-csimple-maven-plugin/pom.xml b/catalog/camel-csimple-maven-plugin/pom.xml
index 5012aa4350b..31c9f35e0ee 100644
--- a/catalog/camel-csimple-maven-plugin/pom.xml
+++ b/catalog/camel-csimple-maven-plugin/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>maven-plugins</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../../tooling/maven</relativePath>
     </parent>
 
diff --git a/catalog/camel-report-maven-plugin/pom.xml b/catalog/camel-report-maven-plugin/pom.xml
index 0dead3d4493..b1967670cea 100644
--- a/catalog/camel-report-maven-plugin/pom.xml
+++ b/catalog/camel-report-maven-plugin/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>maven-plugins</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../../tooling/maven</relativePath>
     </parent>
 
diff --git a/catalog/camel-route-parser/pom.xml b/catalog/camel-route-parser/pom.xml
index d629fd5e209..5b762ad9f31 100644
--- a/catalog/camel-route-parser/pom.xml
+++ b/catalog/camel-route-parser/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>catalog</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-route-parser</artifactId>
diff --git a/catalog/dummy-component/pom.xml b/catalog/dummy-component/pom.xml
index 34dea8b66c0..fcfd4e37e34 100644
--- a/catalog/dummy-component/pom.xml
+++ b/catalog/dummy-component/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>catalog</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/catalog/pom.xml b/catalog/pom.xml
index 2812c6834ae..fda78ce3314 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
 
diff --git a/components/camel-activemq/pom.xml b/components/camel-activemq/pom.xml
index 3c5d573f412..c3612b19b84 100644
--- a/components/camel-activemq/pom.xml
+++ b/components/camel-activemq/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-activemq</artifactId>
diff --git a/components/camel-activemq/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-activemq/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index 16c6c59b2f0..516e1b53342 100644
--- a/components/camel-activemq/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-activemq/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=activemq
 groupId=org.apache.camel
 artifactId=camel-activemq
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: ActiveMQ
 projectDescription=ActiveMQ component for Camel
diff --git a/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json b/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json
index 34c0e33f83d..9ce3cd20f54 100644
--- a/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json
+++ b/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-activemq",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "activemq",
     "extendsScheme": "jms",
     "syntax": "activemq:destinationType:destinationName",
diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml
index 1bc1b27283f..6a87c35fb02 100644
--- a/components/camel-amqp/pom.xml
+++ b/components/camel-amqp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-amqp</artifactId>
diff --git a/components/camel-amqp/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-amqp/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index dacc055e14a..7397c08213e 100644
--- a/components/camel-amqp/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-amqp/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=amqp
 groupId=org.apache.camel
 artifactId=camel-amqp
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: AMQP
 projectDescription=Camel AMQP component which is based on the Apache Qpid project
diff --git a/components/camel-amqp/src/generated/resources/org/apache/camel/component/amqp/amqp.json b/components/camel-amqp/src/generated/resources/org/apache/camel/component/amqp/amqp.json
index 4608b8a82a7..1b078c52e58 100644
--- a/components/camel-amqp/src/generated/resources/org/apache/camel/component/amqp/amqp.json
+++ b/components/camel-amqp/src/generated/resources/org/apache/camel/component/amqp/amqp.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-amqp",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "amqp",
     "extendsScheme": "jms",
     "syntax": "amqp:destinationType:destinationName",
diff --git a/components/camel-any23/pom.xml b/components/camel-any23/pom.xml
index 5e97825634a..d4c23de945e 100644
--- a/components/camel-any23/pom.xml
+++ b/components/camel-any23/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>3.20.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-any23</artifactId>
diff --git a/components/camel-any23/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties b/components/camel-any23/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties
index 1a67f2c2478..66af64382cc 100644
--- a/components/camel-any23/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties
+++ b/components/camel-any23/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties
@@ -2,6 +2,6 @@
 dataFormats=any23
 groupId=org.apache.camel
 artifactId=camel-any23
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: Any23
 projectDescription=Camel Any23 support
diff --git a/components/camel-any23/src/generated/resources/org/apache/camel/dataformat/any23/any23.json b/components/camel-any23/src/generated/resources/org/apache/camel/dataformat/any23/any23.json
index 4a433599433..8f670f181c9 100644
--- a/components/camel-any23/src/generated/resources/org/apache/camel/dataformat/any23/any23.json
+++ b/components/camel-any23/src/generated/resources/org/apache/camel/dataformat/any23/any23.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-any23",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "any23",
     "modelJavaType": "org.apache.camel.model.dataformat.Any23DataFormat"
   },
diff --git a/components/camel-arangodb/pom.xml b/components/camel-arangodb/pom.xml
index 8de526e96cd..195bbea36a0 100644
--- a/components/camel-arangodb/pom.xml
+++ b/components/camel-arangodb/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>components</artifactId>
         <groupId>org.apache.camel</groupId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.camel</groupId>
diff --git a/components/camel-arangodb/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-arangodb/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index aa572ec9279..b71e119c18f 100644
--- a/components/camel-arangodb/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-arangodb/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=arangodb
 groupId=org.apache.camel
 artifactId=camel-arangodb
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: ArangoDB
 projectDescription=Camel ArangoDB (Java Driver) component
diff --git a/components/camel-arangodb/src/generated/resources/org/apache/camel/component/arangodb/arangodb.json b/components/camel-arangodb/src/generated/resources/org/apache/camel/component/arangodb/arangodb.json
index 5ea84ddfb1d..f87605638a8 100644
--- a/components/camel-arangodb/src/generated/resources/org/apache/camel/component/arangodb/arangodb.json
+++ b/components/camel-arangodb/src/generated/resources/org/apache/camel/component/arangodb/arangodb.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-arangodb",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "arangodb",
     "extendsScheme": "",
     "syntax": "arangodb:database",
diff --git a/components/camel-as2/camel-as2-api/pom.xml b/components/camel-as2/camel-as2-api/pom.xml
index b0ff308d488..12809333cb4 100644
--- a/components/camel-as2/camel-as2-api/pom.xml
+++ b/components/camel-as2/camel-as2-api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-as2-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-as2-api</artifactId>
diff --git a/components/camel-as2/camel-as2-api/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-as2/camel-as2-api/src/generated/resources/META-INF/services/org/apache/camel/other.properties
index 599f11b2cf3..4975a57fa0c 100644
--- a/components/camel-as2/camel-as2-api/src/generated/resources/META-INF/services/org/apache/camel/other.properties
+++ b/components/camel-as2/camel-as2-api/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -2,6 +2,6 @@
 name=as2-api
 groupId=org.apache.camel
 artifactId=camel-as2-api
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: AS2 :: API
 projectDescription=Camel AS2 API
diff --git a/components/camel-as2/camel-as2-api/src/generated/resources/as2-api.json b/components/camel-as2/camel-as2-api/src/generated/resources/as2-api.json
index 711f3c0d2e1..6f331da86a6 100644
--- a/components/camel-as2/camel-as2-api/src/generated/resources/as2-api.json
+++ b/components/camel-as2/camel-as2-api/src/generated/resources/as2-api.json
@@ -9,6 +9,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-as2-api",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/components/camel-as2/camel-as2-component/pom.xml b/components/camel-as2/camel-as2-component/pom.xml
index 589b81f9653..d2ffa26888f 100644
--- a/components/camel-as2/camel-as2-component/pom.xml
+++ b/components/camel-as2/camel-as2-component/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-as2-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-as2</artifactId>
diff --git a/components/camel-as2/camel-as2-component/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-as2/camel-as2-component/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index 8880f9321e9..027e3de1512 100644
--- a/components/camel-as2/camel-as2-component/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-as2/camel-as2-component/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=as2
 groupId=org.apache.camel
 artifactId=camel-as2
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: AS2 :: Component
 projectDescription=Camel AS2 component
diff --git a/components/camel-as2/camel-as2-component/src/generated/resources/org/apache/camel/component/as2/as2.json b/components/camel-as2/camel-as2-component/src/generated/resources/org/apache/camel/component/as2/as2.json
index 3f97052e972..eb38c8e73c3 100644
--- a/components/camel-as2/camel-as2-component/src/generated/resources/org/apache/camel/component/as2/as2.json
+++ b/components/camel-as2/camel-as2-component/src/generated/resources/org/apache/camel/component/as2/as2.json
@@ -12,7 +12,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-as2",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "as2",
     "extendsScheme": "",
     "syntax": "as2:apiName\/methodName",
diff --git a/components/camel-as2/pom.xml b/components/camel-as2/pom.xml
index 0f57d81a633..afe6af6687c 100644
--- a/components/camel-as2/pom.xml
+++ b/components/camel-as2/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-as2-parent</artifactId>
diff --git a/components/camel-asn1/pom.xml b/components/camel-asn1/pom.xml
index ffa9b48b07e..e8310c36c57 100644
--- a/components/camel-asn1/pom.xml
+++ b/components/camel-asn1/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-asn1</artifactId>
diff --git a/components/camel-asn1/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties b/components/camel-asn1/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties
index f79a73cbd85..62723dcb43d 100644
--- a/components/camel-asn1/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties
+++ b/components/camel-asn1/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties
@@ -2,6 +2,6 @@
 dataFormats=asn1
 groupId=org.apache.camel
 artifactId=camel-asn1
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: ASN.1
 projectDescription=Camel ASN.1 support
diff --git a/components/camel-asn1/src/generated/resources/org/apache/camel/dataformat/asn1/asn1.json b/components/camel-asn1/src/generated/resources/org/apache/camel/dataformat/asn1/asn1.json
index f52a58b4efb..86588d15274 100644
--- a/components/camel-asn1/src/generated/resources/org/apache/camel/dataformat/asn1/asn1.json
+++ b/components/camel-asn1/src/generated/resources/org/apache/camel/dataformat/asn1/asn1.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-asn1",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "asn1",
     "modelJavaType": "org.apache.camel.model.dataformat.ASN1DataFormat"
   },
diff --git a/components/camel-asterisk/pom.xml b/components/camel-asterisk/pom.xml
index 59adb2057e4..73701052b6b 100644
--- a/components/camel-asterisk/pom.xml
+++ b/components/camel-asterisk/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-asterisk</artifactId>
diff --git a/components/camel-asterisk/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-asterisk/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index 59d1a799996..22861493f01 100644
--- a/components/camel-asterisk/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-asterisk/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=asterisk
 groupId=org.apache.camel
 artifactId=camel-asterisk
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: Asterisk
 projectDescription=Camel Asterisk to interact with an Asterisk PBX Server
diff --git a/components/camel-asterisk/src/generated/resources/org/apache/camel/component/asterisk/asterisk.json b/components/camel-asterisk/src/generated/resources/org/apache/camel/component/asterisk/asterisk.json
index f8850608edd..deac555435f 100644
--- a/components/camel-asterisk/src/generated/resources/org/apache/camel/component/asterisk/asterisk.json
+++ b/components/camel-asterisk/src/generated/resources/org/apache/camel/component/asterisk/asterisk.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-asterisk",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "asterisk",
     "extendsScheme": "",
     "syntax": "asterisk:name",
diff --git a/components/camel-atlasmap/pom.xml b/components/camel-atlasmap/pom.xml
index 3fa5f83db5b..c3921eca831 100644
--- a/components/camel-atlasmap/pom.xml
+++ b/components/camel-atlasmap/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-atlasmap</artifactId>
diff --git a/components/camel-atlasmap/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-atlasmap/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index cc182a759e0..e0bc82c4b7f 100644
--- a/components/camel-atlasmap/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-atlasmap/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=atlasmap
 groupId=org.apache.camel
 artifactId=camel-atlasmap
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: AtlasMap
 projectDescription=Camel AtlasMap support
diff --git a/components/camel-atlasmap/src/generated/resources/org/apache/camel/component/atlasmap/atlasmap.json b/components/camel-atlasmap/src/generated/resources/org/apache/camel/component/atlasmap/atlasmap.json
index 2e58c819eb5..f5cd036ca82 100644
--- a/components/camel-atlasmap/src/generated/resources/org/apache/camel/component/atlasmap/atlasmap.json
+++ b/components/camel-atlasmap/src/generated/resources/org/apache/camel/component/atlasmap/atlasmap.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-atlasmap",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "atlasmap",
     "extendsScheme": "",
     "syntax": "atlasmap:resourceUri",
diff --git a/components/camel-atmos/pom.xml b/components/camel-atmos/pom.xml
index 1ca794c2bee..2c152306cee 100644
--- a/components/camel-atmos/pom.xml
+++ b/components/camel-atmos/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-atmos</artifactId>
diff --git a/components/camel-atmos/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-atmos/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index 780e5fd462e..383c3f98543 100644
--- a/components/camel-atmos/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-atmos/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=atmos
 groupId=org.apache.camel
 artifactId=camel-atmos
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: Atmos
 projectDescription=Camel Atmos support
diff --git a/components/camel-atmos/src/generated/resources/org/apache/camel/component/atmos/atmos.json b/components/camel-atmos/src/generated/resources/org/apache/camel/component/atmos/atmos.json
index 8b566498721..c958700108a 100644
--- a/components/camel-atmos/src/generated/resources/org/apache/camel/component/atmos/atmos.json
+++ b/components/camel-atmos/src/generated/resources/org/apache/camel/component/atmos/atmos.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-atmos",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "atmos",
     "extendsScheme": "",
     "syntax": "atmos:name\/operation",
diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml
index b4f5d993e50..85461df8e3b 100644
--- a/components/camel-atmosphere-websocket/pom.xml
+++ b/components/camel-atmosphere-websocket/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-atmosphere-websocket</artifactId>
diff --git a/components/camel-atmosphere-websocket/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-atmosphere-websocket/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index 4b8be8d306c..b9de23a8f2a 100644
--- a/components/camel-atmosphere-websocket/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-atmosphere-websocket/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=atmosphere-websocket
 groupId=org.apache.camel
 artifactId=camel-atmosphere-websocket
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: Atmosphere WebSocket Servlet
 projectDescription=Camel Atmosphere WebSocket Servlet
diff --git a/components/camel-atmosphere-websocket/src/generated/resources/org/apache/camel/component/atmosphere/websocket/atmosphere-websocket.json b/components/camel-atmosphere-websocket/src/generated/resources/org/apache/camel/component/atmosphere/websocket/atmosphere-websocket.json
index 0a48d012c52..a0de8a221ea 100644
--- a/components/camel-atmosphere-websocket/src/generated/resources/org/apache/camel/component/atmosphere/websocket/atmosphere-websocket.json
+++ b/components/camel-atmosphere-websocket/src/generated/resources/org/apache/camel/component/atmosphere/websocket/atmosphere-websocket.json
@@ -12,7 +12,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-atmosphere-websocket",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "atmosphere-websocket",
     "extendsScheme": "servlet",
     "syntax": "atmosphere-websocket:servicePath",
diff --git a/components/camel-atom/pom.xml b/components/camel-atom/pom.xml
index 97e2e76325a..6dd7dc3862b 100644
--- a/components/camel-atom/pom.xml
+++ b/components/camel-atom/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-atom</artifactId>
diff --git a/components/camel-atom/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-atom/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index e17589b7c17..25d00c0733c 100644
--- a/components/camel-atom/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-atom/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=atom
 groupId=org.apache.camel
 artifactId=camel-atom
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: Atom
 projectDescription=Camel Atom support
diff --git a/components/camel-atom/src/generated/resources/org/apache/camel/component/atom/atom.json b/components/camel-atom/src/generated/resources/org/apache/camel/component/atom/atom.json
index 6eaea0f2aa3..503dc0ee86e 100644
--- a/components/camel-atom/src/generated/resources/org/apache/camel/component/atom/atom.json
+++ b/components/camel-atom/src/generated/resources/org/apache/camel/component/atom/atom.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-atom",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "atom",
     "extendsScheme": "",
     "syntax": "atom:feedUri",
diff --git a/components/camel-attachments/pom.xml b/components/camel-attachments/pom.xml
index 35d3d3ffe20..a70bdcdfb19 100644
--- a/components/camel-attachments/pom.xml
+++ b/components/camel-attachments/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-attachments</artifactId>
diff --git a/components/camel-attachments/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-attachments/src/generated/resources/META-INF/services/org/apache/camel/other.properties
index 86c994e2232..80d4458407b 100644
--- a/components/camel-attachments/src/generated/resources/META-INF/services/org/apache/camel/other.properties
+++ b/components/camel-attachments/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -2,6 +2,6 @@
 name=attachments
 groupId=org.apache.camel
 artifactId=camel-attachments
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: Attachments
 projectDescription=Support for attachments on Camel messages
diff --git a/components/camel-attachments/src/generated/resources/attachments.json b/components/camel-attachments/src/generated/resources/attachments.json
index f128290248f..e83342fa7c0 100644
--- a/components/camel-attachments/src/generated/resources/attachments.json
+++ b/components/camel-attachments/src/generated/resources/attachments.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-attachments",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/components/camel-avro-rpc/camel-avro-rpc-component/pom.xml b/components/camel-avro-rpc/camel-avro-rpc-component/pom.xml
index 33e64e8e6f7..4702e34c6dc 100644
--- a/components/camel-avro-rpc/camel-avro-rpc-component/pom.xml
+++ b/components/camel-avro-rpc/camel-avro-rpc-component/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-avro-rpc-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-avro-rpc</artifactId>
diff --git a/components/camel-avro-rpc/camel-avro-rpc-component/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-avro-rpc/camel-avro-rpc-component/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index 475ce7c9781..8189c0fe4b2 100644
--- a/components/camel-avro-rpc/camel-avro-rpc-component/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-avro-rpc/camel-avro-rpc-component/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=avro
 groupId=org.apache.camel
 artifactId=camel-avro-rpc
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: Avro RPC
 projectDescription=Camel Avro  RPC component
diff --git a/components/camel-avro-rpc/camel-avro-rpc-component/src/generated/resources/org/apache/camel/component/avro/avro.json b/components/camel-avro-rpc/camel-avro-rpc-component/src/generated/resources/org/apache/camel/component/avro/avro.json
index 58a11e79382..10dc148393a 100644
--- a/components/camel-avro-rpc/camel-avro-rpc-component/src/generated/resources/org/apache/camel/component/avro/avro.json
+++ b/components/camel-avro-rpc/camel-avro-rpc-component/src/generated/resources/org/apache/camel/component/avro/avro.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-avro-rpc",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "avro",
     "extendsScheme": "",
     "syntax": "avro:transport:host:port\/messageName",
diff --git a/components/camel-avro-rpc/camel-avro-rpc-jetty/pom.xml b/components/camel-avro-rpc/camel-avro-rpc-jetty/pom.xml
index 03349b0cb00..e00b71a8fa0 100644
--- a/components/camel-avro-rpc/camel-avro-rpc-jetty/pom.xml
+++ b/components/camel-avro-rpc/camel-avro-rpc-jetty/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-avro-rpc-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-avro-rpc-jetty</artifactId>
diff --git a/components/camel-avro-rpc/camel-avro-rpc-jetty/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-avro-rpc/camel-avro-rpc-jetty/src/generated/resources/META-INF/services/org/apache/camel/other.properties
index 242ab9932bc..630e6d5e8e7 100644
--- a/components/camel-avro-rpc/camel-avro-rpc-jetty/src/generated/resources/META-INF/services/org/apache/camel/other.properties
+++ b/components/camel-avro-rpc/camel-avro-rpc-jetty/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -2,6 +2,6 @@
 name=avro-rpc-jetty
 groupId=org.apache.camel
 artifactId=camel-avro-rpc-jetty
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: Avro RPC :: Jetty
 projectDescription=Camel Avro  RPC Jetty
diff --git a/components/camel-avro-rpc/camel-avro-rpc-jetty/src/generated/resources/avro-rpc-jetty.json b/components/camel-avro-rpc/camel-avro-rpc-jetty/src/generated/resources/avro-rpc-jetty.json
index bd468a26383..f676a5ece57 100644
--- a/components/camel-avro-rpc/camel-avro-rpc-jetty/src/generated/resources/avro-rpc-jetty.json
+++ b/components/camel-avro-rpc/camel-avro-rpc-jetty/src/generated/resources/avro-rpc-jetty.json
@@ -9,6 +9,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-avro-rpc-jetty",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/components/camel-avro-rpc/camel-avro-rpc-spi/pom.xml b/components/camel-avro-rpc/camel-avro-rpc-spi/pom.xml
index 8a5d6415be2..e418a12606e 100644
--- a/components/camel-avro-rpc/camel-avro-rpc-spi/pom.xml
+++ b/components/camel-avro-rpc/camel-avro-rpc-spi/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-avro-rpc-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-avro-rpc-spi</artifactId>
diff --git a/components/camel-avro-rpc/camel-avro-rpc-spi/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-avro-rpc/camel-avro-rpc-spi/src/generated/resources/META-INF/services/org/apache/camel/other.properties
index 2a0630f9885..3ddd01ce848 100644
--- a/components/camel-avro-rpc/camel-avro-rpc-spi/src/generated/resources/META-INF/services/org/apache/camel/other.properties
+++ b/components/camel-avro-rpc/camel-avro-rpc-spi/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -2,6 +2,6 @@
 name=avro-rpc-spi
 groupId=org.apache.camel
 artifactId=camel-avro-rpc-spi
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: Avro RPC :: Spi
 projectDescription=Camel Avro  RPC spi
diff --git a/components/camel-avro-rpc/camel-avro-rpc-spi/src/generated/resources/avro-rpc-spi.json b/components/camel-avro-rpc/camel-avro-rpc-spi/src/generated/resources/avro-rpc-spi.json
index 9526c823b68..45047fdbd1d 100644
--- a/components/camel-avro-rpc/camel-avro-rpc-spi/src/generated/resources/avro-rpc-spi.json
+++ b/components/camel-avro-rpc/camel-avro-rpc-spi/src/generated/resources/avro-rpc-spi.json
@@ -9,6 +9,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-avro-rpc-spi",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/components/camel-avro-rpc/pom.xml b/components/camel-avro-rpc/pom.xml
index 3657fd1eb53..5fa72396f51 100644
--- a/components/camel-avro-rpc/pom.xml
+++ b/components/camel-avro-rpc/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-avro-rpc-parent</artifactId>
diff --git a/components/camel-avro/pom.xml b/components/camel-avro/pom.xml
index fe45ad30e4a..98ae1fab8b8 100644
--- a/components/camel-avro/pom.xml
+++ b/components/camel-avro/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-avro</artifactId>
diff --git a/components/camel-avro/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties b/components/camel-avro/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties
index a5e172e7e8a..77ac2421015 100644
--- a/components/camel-avro/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties
+++ b/components/camel-avro/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties
@@ -2,6 +2,6 @@
 dataFormats=avro
 groupId=org.apache.camel
 artifactId=camel-avro
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: Avro
 projectDescription=Camel Avro data format
diff --git a/components/camel-avro/src/generated/resources/org/apache/camel/dataformat/avro/avro.json b/components/camel-avro/src/generated/resources/org/apache/camel/dataformat/avro/avro.json
index d743534e336..cf65ec3341c 100644
--- a/components/camel-avro/src/generated/resources/org/apache/camel/dataformat/avro/avro.json
+++ b/components/camel-avro/src/generated/resources/org/apache/camel/dataformat/avro/avro.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-avro",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "modelName": "avro",
     "modelJavaType": "org.apache.camel.model.dataformat.AvroDataFormat"
   },
diff --git a/components/camel-aws/camel-aws-cloudtrail/pom.xml b/components/camel-aws/camel-aws-cloudtrail/pom.xml
index 9a049778441..d1f57e245f8 100644
--- a/components/camel-aws/camel-aws-cloudtrail/pom.xml
+++ b/components/camel-aws/camel-aws-cloudtrail/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-aws-cloudtrail</artifactId>
diff --git a/components/camel-aws/camel-aws-cloudtrail/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-aws/camel-aws-cloudtrail/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index 25544a7dd56..30ba515f71f 100644
--- a/components/camel-aws/camel-aws-cloudtrail/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-aws/camel-aws-cloudtrail/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=aws-cloudtrail aws-kinesis
 groupId=org.apache.camel
 artifactId=camel-aws-cloudtrail
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: AWS Cloutrail
 projectDescription=A Camel Amazon Cloudtrail Web Service Component Version 2
diff --git a/components/camel-aws/camel-aws-cloudtrail/src/generated/resources/org/apache/camel/component/aws/cloudtrail/aws-cloudtrail.json b/components/camel-aws/camel-aws-cloudtrail/src/generated/resources/org/apache/camel/component/aws/cloudtrail/aws-cloudtrail.json
index 70b7719b748..658c15fa3a2 100644
--- a/components/camel-aws/camel-aws-cloudtrail/src/generated/resources/org/apache/camel/component/aws/cloudtrail/aws-cloudtrail.json
+++ b/components/camel-aws/camel-aws-cloudtrail/src/generated/resources/org/apache/camel/component/aws/cloudtrail/aws-cloudtrail.json
@@ -11,7 +11,7 @@
     "supportLevel": "Preview",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws-cloudtrail",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws-cloudtrail",
     "extendsScheme": "",
     "syntax": "aws-cloudtrail:label",
diff --git a/components/camel-aws/camel-aws-secrets-manager/pom.xml b/components/camel-aws/camel-aws-secrets-manager/pom.xml
index 533b5ac702f..1f6fcce181c 100644
--- a/components/camel-aws/camel-aws-secrets-manager/pom.xml
+++ b/components/camel-aws/camel-aws-secrets-manager/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-aws-secrets-manager</artifactId>
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-aws/camel-aws-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index e0f88db88cd..da6dbaff7b9 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-aws/camel-aws-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=aws-secrets-manager
 groupId=org.apache.camel
 artifactId=camel-aws-secrets-manager
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: AWS2 Secrets Manager
 projectDescription=A Camel Amazon Secrets Manager Web Service Component
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/generated/resources/org/apache/camel/component/aws/secretsmanager/aws-secrets-manager.json b/components/camel-aws/camel-aws-secrets-manager/src/generated/resources/org/apache/camel/component/aws/secretsmanager/aws-secrets-manager.json
index 52d774120af..076c2e4495c 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/generated/resources/org/apache/camel/component/aws/secretsmanager/aws-secrets-manager.json
+++ b/components/camel-aws/camel-aws-secrets-manager/src/generated/resources/org/apache/camel/component/aws/secretsmanager/aws-secrets-manager.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws-secrets-manager",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws-secrets-manager",
     "extendsScheme": "",
     "syntax": "aws-secrets-manager:label",
diff --git a/components/camel-aws/camel-aws-xray/pom.xml b/components/camel-aws/camel-aws-xray/pom.xml
index 5c3ecba28e0..641cc76f406 100644
--- a/components/camel-aws/camel-aws-xray/pom.xml
+++ b/components/camel-aws/camel-aws-xray/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-aws-xray</artifactId>
diff --git a/components/camel-aws/camel-aws-xray/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-aws/camel-aws-xray/src/generated/resources/META-INF/services/org/apache/camel/other.properties
index 61f0c7e9ed6..c93a0fd86f4 100644
--- a/components/camel-aws/camel-aws-xray/src/generated/resources/META-INF/services/org/apache/camel/other.properties
+++ b/components/camel-aws/camel-aws-xray/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -2,6 +2,6 @@
 name=aws-xray
 groupId=org.apache.camel
 artifactId=camel-aws-xray
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: AWS :: XRay
 projectDescription=Distributed tracing using AWS XRay
diff --git a/components/camel-aws/camel-aws-xray/src/generated/resources/aws-xray.json b/components/camel-aws/camel-aws-xray/src/generated/resources/aws-xray.json
index 64c1691161a..c220c23f8a3 100644
--- a/components/camel-aws/camel-aws-xray/src/generated/resources/aws-xray.json
+++ b/components/camel-aws/camel-aws-xray/src/generated/resources/aws-xray.json
@@ -10,6 +10,6 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws-xray",
-    "version": "3.20.0-SNAPSHOT"
+    "version": "4.0.0-SNAPSHOT"
   }
 }
diff --git a/components/camel-aws/camel-aws2-athena/pom.xml b/components/camel-aws/camel-aws2-athena/pom.xml
index 2a83b5f5454..e9884cefd49 100644
--- a/components/camel-aws/camel-aws2-athena/pom.xml
+++ b/components/camel-aws/camel-aws2-athena/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-aws2-athena</artifactId>
diff --git a/components/camel-aws/camel-aws2-athena/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-aws/camel-aws2-athena/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index fcc9a2a9a40..cfa43b7adc4 100644
--- a/components/camel-aws/camel-aws2-athena/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-aws/camel-aws2-athena/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=aws2-athena
 groupId=org.apache.camel
 artifactId=camel-aws2-athena
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: AWS2 Athena
 projectDescription=A Camel Amazon Athena Web Service Component Version 2
diff --git a/components/camel-aws/camel-aws2-athena/src/generated/resources/org/apache/camel/component/aws2/athena/aws2-athena.json b/components/camel-aws/camel-aws2-athena/src/generated/resources/org/apache/camel/component/aws2/athena/aws2-athena.json
index b359c507c83..0d5b11c0b90 100644
--- a/components/camel-aws/camel-aws2-athena/src/generated/resources/org/apache/camel/component/aws2/athena/aws2-athena.json
+++ b/components/camel-aws/camel-aws2-athena/src/generated/resources/org/apache/camel/component/aws2/athena/aws2-athena.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-athena",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-athena",
     "extendsScheme": "",
     "syntax": "aws2-athena:label",
diff --git a/components/camel-aws/camel-aws2-cw/pom.xml b/components/camel-aws/camel-aws2-cw/pom.xml
index a910417f81a..3e06311975e 100644
--- a/components/camel-aws/camel-aws2-cw/pom.xml
+++ b/components/camel-aws/camel-aws2-cw/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-aws2-cw</artifactId>
diff --git a/components/camel-aws/camel-aws2-cw/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-aws/camel-aws2-cw/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index 3b883a682aa..24527ab143f 100644
--- a/components/camel-aws/camel-aws2-cw/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-aws/camel-aws2-cw/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=aws2-cw
 groupId=org.apache.camel
 artifactId=camel-aws2-cw
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: AWS2 CW
 projectDescription=A Camel Amazon CW Web Service Component Version 2
diff --git a/components/camel-aws/camel-aws2-cw/src/generated/resources/org/apache/camel/component/aws2/cw/aws2-cw.json b/components/camel-aws/camel-aws2-cw/src/generated/resources/org/apache/camel/component/aws2/cw/aws2-cw.json
index 1332c9dd761..29c1254edde 100644
--- a/components/camel-aws/camel-aws2-cw/src/generated/resources/org/apache/camel/component/aws2/cw/aws2-cw.json
+++ b/components/camel-aws/camel-aws2-cw/src/generated/resources/org/apache/camel/component/aws2/cw/aws2-cw.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-cw",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-cw",
     "extendsScheme": "",
     "syntax": "aws2-cw:namespace",
diff --git a/components/camel-aws/camel-aws2-ddb/pom.xml b/components/camel-aws/camel-aws2-ddb/pom.xml
index b0c63b31266..9437293f9ce 100644
--- a/components/camel-aws/camel-aws2-ddb/pom.xml
+++ b/components/camel-aws/camel-aws2-ddb/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-aws2-ddb</artifactId>
diff --git a/components/camel-aws/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-aws/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index 256be2fcf27..246941083d6 100644
--- a/components/camel-aws/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-aws/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=aws2-ddb aws2-ddbstream
 groupId=org.apache.camel
 artifactId=camel-aws2-ddb
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: AWS2 DDB
 projectDescription=A Camel Amazon DynamoDB Web Service Component Version 2
diff --git a/components/camel-aws/camel-aws2-ddb/src/generated/resources/org/apache/camel/component/aws2/ddb/aws2-ddb.json b/components/camel-aws/camel-aws2-ddb/src/generated/resources/org/apache/camel/component/aws2/ddb/aws2-ddb.json
index b398416bef1..0841770c3a5 100644
--- a/components/camel-aws/camel-aws2-ddb/src/generated/resources/org/apache/camel/component/aws2/ddb/aws2-ddb.json
+++ b/components/camel-aws/camel-aws2-ddb/src/generated/resources/org/apache/camel/component/aws2/ddb/aws2-ddb.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-ddb",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-ddb",
     "extendsScheme": "",
     "syntax": "aws2-ddb:tableName",
diff --git a/components/camel-aws/camel-aws2-ddb/src/generated/resources/org/apache/camel/component/aws2/ddbstream/aws2-ddbstream.json b/components/camel-aws/camel-aws2-ddb/src/generated/resources/org/apache/camel/component/aws2/ddbstream/aws2-ddbstream.json
index 0f30cf3c791..baa5c3a98bb 100644
--- a/components/camel-aws/camel-aws2-ddb/src/generated/resources/org/apache/camel/component/aws2/ddbstream/aws2-ddbstream.json
+++ b/components/camel-aws/camel-aws2-ddb/src/generated/resources/org/apache/camel/component/aws2/ddbstream/aws2-ddbstream.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-ddb",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-ddbstream",
     "extendsScheme": "",
     "syntax": "aws2-ddbstream:tableName",
diff --git a/components/camel-aws/camel-aws2-ec2/pom.xml b/components/camel-aws/camel-aws2-ec2/pom.xml
index 20158373de1..cafe0934031 100644
--- a/components/camel-aws/camel-aws2-ec2/pom.xml
+++ b/components/camel-aws/camel-aws2-ec2/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-aws2-ec2</artifactId>
diff --git a/components/camel-aws/camel-aws2-ec2/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-aws/camel-aws2-ec2/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index c472c3477e3..f0a885bd234 100644
--- a/components/camel-aws/camel-aws2-ec2/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-aws/camel-aws2-ec2/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=aws2-ec2
 groupId=org.apache.camel
 artifactId=camel-aws2-ec2
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: AWS2 EC2
 projectDescription=A Camel Amazon EC2 Web Service Component Version 2
diff --git a/components/camel-aws/camel-aws2-ec2/src/generated/resources/org/apache/camel/component/aws2/ec2/aws2-ec2.json b/components/camel-aws/camel-aws2-ec2/src/generated/resources/org/apache/camel/component/aws2/ec2/aws2-ec2.json
index 21c1b5bd6c7..ff7d1e711de 100644
--- a/components/camel-aws/camel-aws2-ec2/src/generated/resources/org/apache/camel/component/aws2/ec2/aws2-ec2.json
+++ b/components/camel-aws/camel-aws2-ec2/src/generated/resources/org/apache/camel/component/aws2/ec2/aws2-ec2.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-ec2",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-ec2",
     "extendsScheme": "",
     "syntax": "aws2-ec2:label",
diff --git a/components/camel-aws/camel-aws2-ecs/pom.xml b/components/camel-aws/camel-aws2-ecs/pom.xml
index 7f2758a72ff..2015a6987e8 100644
--- a/components/camel-aws/camel-aws2-ecs/pom.xml
+++ b/components/camel-aws/camel-aws2-ecs/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-aws2-ecs</artifactId>
diff --git a/components/camel-aws/camel-aws2-ecs/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-aws/camel-aws2-ecs/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index 8bc3e3f3582..cc237708daa 100644
--- a/components/camel-aws/camel-aws2-ecs/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-aws/camel-aws2-ecs/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=aws2-ecs
 groupId=org.apache.camel
 artifactId=camel-aws2-ecs
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: AWS2 ECS
 projectDescription=A Camel Amazon ECS Web Service Component Version 2
diff --git a/components/camel-aws/camel-aws2-ecs/src/generated/resources/org/apache/camel/component/aws2/ecs/aws2-ecs.json b/components/camel-aws/camel-aws2-ecs/src/generated/resources/org/apache/camel/component/aws2/ecs/aws2-ecs.json
index eb05ba4b009..1529b590e06 100644
--- a/components/camel-aws/camel-aws2-ecs/src/generated/resources/org/apache/camel/component/aws2/ecs/aws2-ecs.json
+++ b/components/camel-aws/camel-aws2-ecs/src/generated/resources/org/apache/camel/component/aws2/ecs/aws2-ecs.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-ecs",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-ecs",
     "extendsScheme": "",
     "syntax": "aws2-ecs:label",
diff --git a/components/camel-aws/camel-aws2-eks/pom.xml b/components/camel-aws/camel-aws2-eks/pom.xml
index f1c99666737..2cbb75b576d 100644
--- a/components/camel-aws/camel-aws2-eks/pom.xml
+++ b/components/camel-aws/camel-aws2-eks/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-aws2-eks</artifactId>
diff --git a/components/camel-aws/camel-aws2-eks/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-aws/camel-aws2-eks/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index fad8dd1b4b4..51c4a6255fc 100644
--- a/components/camel-aws/camel-aws2-eks/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-aws/camel-aws2-eks/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=aws2-eks
 groupId=org.apache.camel
 artifactId=camel-aws2-eks
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: AWS2 EKS
 projectDescription=A Camel Amazon EKS Web Service Component Version 2
diff --git a/components/camel-aws/camel-aws2-eks/src/generated/resources/org/apache/camel/component/aws2/eks/aws2-eks.json b/components/camel-aws/camel-aws2-eks/src/generated/resources/org/apache/camel/component/aws2/eks/aws2-eks.json
index 930e3e84006..efcd23d690b 100644
--- a/components/camel-aws/camel-aws2-eks/src/generated/resources/org/apache/camel/component/aws2/eks/aws2-eks.json
+++ b/components/camel-aws/camel-aws2-eks/src/generated/resources/org/apache/camel/component/aws2/eks/aws2-eks.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-eks",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-eks",
     "extendsScheme": "",
     "syntax": "aws2-eks:label",
diff --git a/components/camel-aws/camel-aws2-eventbridge/pom.xml b/components/camel-aws/camel-aws2-eventbridge/pom.xml
index a5ade61ddaf..443be21ead9 100644
--- a/components/camel-aws/camel-aws2-eventbridge/pom.xml
+++ b/components/camel-aws/camel-aws2-eventbridge/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-aws2-eventbridge</artifactId>
diff --git a/components/camel-aws/camel-aws2-eventbridge/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-aws/camel-aws2-eventbridge/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index 1bb75b2ba98..7c44d2df27b 100644
--- a/components/camel-aws/camel-aws2-eventbridge/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-aws/camel-aws2-eventbridge/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=aws2-eventbridge
 groupId=org.apache.camel
 artifactId=camel-aws2-eventbridge
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: AWS2 Eventbridge
 projectDescription=A Camel Amazon Eventbridge Web Service Component Version 2
diff --git a/components/camel-aws/camel-aws2-eventbridge/src/generated/resources/org/apache/camel/component/aws2/eventbridge/aws2-eventbridge.json b/components/camel-aws/camel-aws2-eventbridge/src/generated/resources/org/apache/camel/component/aws2/eventbridge/aws2-eventbridge.json
index 019914b4d6d..f4b5ee4bd2d 100644
--- a/components/camel-aws/camel-aws2-eventbridge/src/generated/resources/org/apache/camel/component/aws2/eventbridge/aws2-eventbridge.json
+++ b/components/camel-aws/camel-aws2-eventbridge/src/generated/resources/org/apache/camel/component/aws2/eventbridge/aws2-eventbridge.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-eventbridge",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-eventbridge",
     "extendsScheme": "",
     "syntax": "aws2-eventbridge:\/\/eventbusNameOrArn",
diff --git a/components/camel-aws/camel-aws2-iam/pom.xml b/components/camel-aws/camel-aws2-iam/pom.xml
index e9182611fa0..5f3f8a0386d 100644
--- a/components/camel-aws/camel-aws2-iam/pom.xml
+++ b/components/camel-aws/camel-aws2-iam/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-aws2-iam</artifactId>
diff --git a/components/camel-aws/camel-aws2-iam/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-aws/camel-aws2-iam/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index d04207d5f87..a29fee0a148 100644
--- a/components/camel-aws/camel-aws2-iam/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-aws/camel-aws2-iam/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=aws2-iam
 groupId=org.apache.camel
 artifactId=camel-aws2-iam
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: AWS2 IAM
 projectDescription=A Camel Amazon IAM Web Service Component Version 2
diff --git a/components/camel-aws/camel-aws2-iam/src/generated/resources/org/apache/camel/component/aws2/iam/aws2-iam.json b/components/camel-aws/camel-aws2-iam/src/generated/resources/org/apache/camel/component/aws2/iam/aws2-iam.json
index 6f5a6d93d9e..a5e91a3a6c6 100644
--- a/components/camel-aws/camel-aws2-iam/src/generated/resources/org/apache/camel/component/aws2/iam/aws2-iam.json
+++ b/components/camel-aws/camel-aws2-iam/src/generated/resources/org/apache/camel/component/aws2/iam/aws2-iam.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-iam",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-iam",
     "extendsScheme": "",
     "syntax": "aws2-iam:label",
diff --git a/components/camel-aws/camel-aws2-kinesis/pom.xml b/components/camel-aws/camel-aws2-kinesis/pom.xml
index 02635dffa8e..9a88050a03d 100644
--- a/components/camel-aws/camel-aws2-kinesis/pom.xml
+++ b/components/camel-aws/camel-aws2-kinesis/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-aws2-kinesis</artifactId>
diff --git a/components/camel-aws/camel-aws2-kinesis/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-aws/camel-aws2-kinesis/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index 286191ec448..4e27c4c7929 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-aws/camel-aws2-kinesis/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=aws2-kinesis aws2-kinesis-firehose
 groupId=org.apache.camel
 artifactId=camel-aws2-kinesis
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: AWS2 Kinesis
 projectDescription=A Camel Amazon Kinesis Web Service Component Version 2
diff --git a/components/camel-aws/camel-aws2-kinesis/src/generated/resources/org/apache/camel/component/aws2/firehose/aws2-kinesis-firehose.json b/components/camel-aws/camel-aws2-kinesis/src/generated/resources/org/apache/camel/component/aws2/firehose/aws2-kinesis-firehose.json
index 5430181d12f..beb11cc6253 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/generated/resources/org/apache/camel/component/aws2/firehose/aws2-kinesis-firehose.json
+++ b/components/camel-aws/camel-aws2-kinesis/src/generated/resources/org/apache/camel/component/aws2/firehose/aws2-kinesis-firehose.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-kinesis",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-kinesis-firehose",
     "extendsScheme": "",
     "syntax": "aws2-kinesis-firehose:streamName",
diff --git a/components/camel-aws/camel-aws2-kinesis/src/generated/resources/org/apache/camel/component/aws2/kinesis/aws2-kinesis.json b/components/camel-aws/camel-aws2-kinesis/src/generated/resources/org/apache/camel/component/aws2/kinesis/aws2-kinesis.json
index 1d44d7248cf..96e0cb7a46b 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/generated/resources/org/apache/camel/component/aws2/kinesis/aws2-kinesis.json
+++ b/components/camel-aws/camel-aws2-kinesis/src/generated/resources/org/apache/camel/component/aws2/kinesis/aws2-kinesis.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-kinesis",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-kinesis",
     "extendsScheme": "",
     "syntax": "aws2-kinesis:streamName",
diff --git a/components/camel-aws/camel-aws2-kms/pom.xml b/components/camel-aws/camel-aws2-kms/pom.xml
index db268b1f3d7..ffe192aecd5 100644
--- a/components/camel-aws/camel-aws2-kms/pom.xml
+++ b/components/camel-aws/camel-aws2-kms/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-aws2-kms</artifactId>
diff --git a/components/camel-aws/camel-aws2-kms/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-aws/camel-aws2-kms/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index d3cbc270273..f3ccaa8c352 100644
--- a/components/camel-aws/camel-aws2-kms/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-aws/camel-aws2-kms/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=aws2-kms
 groupId=org.apache.camel
 artifactId=camel-aws2-kms
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: AWS2 KMS
 projectDescription=A Camel Amazon KMS Web Service Component Version 2
diff --git a/components/camel-aws/camel-aws2-kms/src/generated/resources/org/apache/camel/component/aws2/kms/aws2-kms.json b/components/camel-aws/camel-aws2-kms/src/generated/resources/org/apache/camel/component/aws2/kms/aws2-kms.json
index 45525309661..f55d3200015 100644
--- a/components/camel-aws/camel-aws2-kms/src/generated/resources/org/apache/camel/component/aws2/kms/aws2-kms.json
+++ b/components/camel-aws/camel-aws2-kms/src/generated/resources/org/apache/camel/component/aws2/kms/aws2-kms.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-kms",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-kms",
     "extendsScheme": "",
     "syntax": "aws2-kms:label",
diff --git a/components/camel-aws/camel-aws2-lambda/pom.xml b/components/camel-aws/camel-aws2-lambda/pom.xml
index 8b3141e3a7a..1101cc99a51 100644
--- a/components/camel-aws/camel-aws2-lambda/pom.xml
+++ b/components/camel-aws/camel-aws2-lambda/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-aws2-lambda</artifactId>
diff --git a/components/camel-aws/camel-aws2-lambda/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-aws/camel-aws2-lambda/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index f22754af502..9ca57d83c1a 100644
--- a/components/camel-aws/camel-aws2-lambda/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-aws/camel-aws2-lambda/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=aws2-lambda
 groupId=org.apache.camel
 artifactId=camel-aws2-lambda
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: AWS2 Lambda
 projectDescription=A Camel Amazon Lambda We Service Component Version 2
diff --git a/components/camel-aws/camel-aws2-lambda/src/generated/resources/org/apache/camel/component/aws2/lambda/aws2-lambda.json b/components/camel-aws/camel-aws2-lambda/src/generated/resources/org/apache/camel/component/aws2/lambda/aws2-lambda.json
index 62b46e940f4..d79986d895b 100644
--- a/components/camel-aws/camel-aws2-lambda/src/generated/resources/org/apache/camel/component/aws2/lambda/aws2-lambda.json
+++ b/components/camel-aws/camel-aws2-lambda/src/generated/resources/org/apache/camel/component/aws2/lambda/aws2-lambda.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-lambda",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-lambda",
     "extendsScheme": "",
     "syntax": "aws2-lambda:function",
diff --git a/components/camel-aws/camel-aws2-mq/pom.xml b/components/camel-aws/camel-aws2-mq/pom.xml
index ae83a3e81dd..3f2cdfee2f6 100644
--- a/components/camel-aws/camel-aws2-mq/pom.xml
+++ b/components/camel-aws/camel-aws2-mq/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-aws2-mq</artifactId>
diff --git a/components/camel-aws/camel-aws2-mq/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-aws/camel-aws2-mq/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index 726df14ef24..3687089165d 100644
--- a/components/camel-aws/camel-aws2-mq/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-aws/camel-aws2-mq/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=aws2-mq
 groupId=org.apache.camel
 artifactId=camel-aws2-mq
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: AWS2 MQ
 projectDescription=A Camel Amazon MQ Web Service Component Version 2
diff --git a/components/camel-aws/camel-aws2-mq/src/generated/resources/org/apache/camel/component/aws2/mq/aws2-mq.json b/components/camel-aws/camel-aws2-mq/src/generated/resources/org/apache/camel/component/aws2/mq/aws2-mq.json
index 0ff702ac54f..b0ffbd1a08e 100644
--- a/components/camel-aws/camel-aws2-mq/src/generated/resources/org/apache/camel/component/aws2/mq/aws2-mq.json
+++ b/components/camel-aws/camel-aws2-mq/src/generated/resources/org/apache/camel/component/aws2/mq/aws2-mq.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-mq",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-mq",
     "extendsScheme": "",
     "syntax": "aws2-mq:label",
diff --git a/components/camel-aws/camel-aws2-msk/pom.xml b/components/camel-aws/camel-aws2-msk/pom.xml
index 5e481546fae..87128620d59 100644
--- a/components/camel-aws/camel-aws2-msk/pom.xml
+++ b/components/camel-aws/camel-aws2-msk/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-aws2-msk</artifactId>
diff --git a/components/camel-aws/camel-aws2-msk/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-aws/camel-aws2-msk/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index a5ff13262f9..5dd8d7813bd 100644
--- a/components/camel-aws/camel-aws2-msk/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-aws/camel-aws2-msk/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=aws2-msk
 groupId=org.apache.camel
 artifactId=camel-aws2-msk
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: AWS2 MSK
 projectDescription=A Camel Amazon MSK Web Service Component Version 2
diff --git a/components/camel-aws/camel-aws2-msk/src/generated/resources/org/apache/camel/component/aws2/msk/aws2-msk.json b/components/camel-aws/camel-aws2-msk/src/generated/resources/org/apache/camel/component/aws2/msk/aws2-msk.json
index 5358711aa88..38f2c0ba6f7 100644
--- a/components/camel-aws/camel-aws2-msk/src/generated/resources/org/apache/camel/component/aws2/msk/aws2-msk.json
+++ b/components/camel-aws/camel-aws2-msk/src/generated/resources/org/apache/camel/component/aws2/msk/aws2-msk.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-msk",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-msk",
     "extendsScheme": "",
     "syntax": "aws2-msk:label",
diff --git a/components/camel-aws/camel-aws2-s3/pom.xml b/components/camel-aws/camel-aws2-s3/pom.xml
index 4bf43653ca0..6a73e1c000e 100644
--- a/components/camel-aws/camel-aws2-s3/pom.xml
+++ b/components/camel-aws/camel-aws2-s3/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-aws2-s3</artifactId>
diff --git a/components/camel-aws/camel-aws2-s3/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-aws/camel-aws2-s3/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index 47399827680..733127ebb99 100644
--- a/components/camel-aws/camel-aws2-s3/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-aws/camel-aws2-s3/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=aws2-s3
 groupId=org.apache.camel
 artifactId=camel-aws2-s3
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: AWS2 S3
 projectDescription=A Camel Amazon S3 Web Service Component Version 2
diff --git a/components/camel-aws/camel-aws2-s3/src/generated/resources/org/apache/camel/component/aws2/s3/aws2-s3.json b/components/camel-aws/camel-aws2-s3/src/generated/resources/org/apache/camel/component/aws2/s3/aws2-s3.json
index f852ea74b8b..98172808cb6 100644
--- a/components/camel-aws/camel-aws2-s3/src/generated/resources/org/apache/camel/component/aws2/s3/aws2-s3.json
+++ b/components/camel-aws/camel-aws2-s3/src/generated/resources/org/apache/camel/component/aws2/s3/aws2-s3.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-s3",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-s3",
     "extendsScheme": "",
     "syntax": "aws2-s3:\/\/bucketNameOrArn",
diff --git a/components/camel-aws/camel-aws2-ses/pom.xml b/components/camel-aws/camel-aws2-ses/pom.xml
index 7a2624c652e..4830f654b22 100644
--- a/components/camel-aws/camel-aws2-ses/pom.xml
+++ b/components/camel-aws/camel-aws2-ses/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-aws2-ses</artifactId>
diff --git a/components/camel-aws/camel-aws2-ses/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-aws/camel-aws2-ses/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index 4e385bbdaa4..a60a8643e2f 100644
--- a/components/camel-aws/camel-aws2-ses/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-aws/camel-aws2-ses/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=aws2-ses
 groupId=org.apache.camel
 artifactId=camel-aws2-ses
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: AWS2 SES
 projectDescription=A Camel Amazon SES Web Service Component Version 2
diff --git a/components/camel-aws/camel-aws2-ses/src/generated/resources/org/apache/camel/component/aws2/ses/aws2-ses.json b/components/camel-aws/camel-aws2-ses/src/generated/resources/org/apache/camel/component/aws2/ses/aws2-ses.json
index 5fc41a5b7be..e9ef7926a8a 100644
--- a/components/camel-aws/camel-aws2-ses/src/generated/resources/org/apache/camel/component/aws2/ses/aws2-ses.json
+++ b/components/camel-aws/camel-aws2-ses/src/generated/resources/org/apache/camel/component/aws2/ses/aws2-ses.json
@@ -11,7 +11,7 @@
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-aws2-ses",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "aws2-ses",
     "extendsScheme": "",
     "syntax": "aws2-ses:from",
diff --git a/components/camel-aws/camel-aws2-sns/pom.xml b/components/camel-aws/camel-aws2-sns/pom.xml
index d53b82db70a..166767cca04 100644
--- a/components/camel-aws/camel-aws2-sns/pom.xml
+++ b/components/camel-aws/camel-aws2-sns/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws-parent</artifactId>
-        <version>3.20.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-aws2-sns</artifactId>
diff --git a/components/camel-aws/camel-aws2-sns/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-aws/camel-aws2-sns/src/generated/resources/META-INF/services/org/apache/camel/component.properties
index 84f88b41097..acda1065837 100644
--- a/components/camel-aws/camel-aws2-sns/src/generated/resources/META-INF/services/org/apache/camel/component.properties
+++ b/components/camel-aws/camel-aws2-sns/src/generated/resources/META-INF/services/org/apache/camel/component.properties
@@ -2,6 +2,6 @@
 components=aws2-sns
 groupId=org.apache.camel
 artifactId=camel-aws2-sns
-version=3.20.0-SNAPSHOT
+version=4.0.0-SNAPSHOT
 projectName=Camel :: AWS2 SNS
 projectDescription=A Camel Amazon SNS Web Service Component Version 2
... 21063 lines suppressed ...


[camel] 01/08: Rewrite script

Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch jakarta-rewritten
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 4d8fec537e706f230ff832dab2af55e580d59767
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Thu Nov 24 15:53:25 2022 +0100

    Rewrite script
---
 jakarta/transform.sh | 321 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 321 insertions(+)

diff --git a/jakarta/transform.sh b/jakarta/transform.sh
new file mode 100755
index 00000000000..d8439400aea
--- /dev/null
+++ b/jakarta/transform.sh
@@ -0,0 +1,321 @@
+#!bash
+shopt -s globstar dotglob nullglob
+
+# Rebase on top of main
+git checkout jakarta-rewrite
+git pull --rebase origin main
+# Create/reset branch 'rewritten'
+git checkout -B jakarta-rewritten jakarta-rewrite
+
+# Switch version to 4.0.0-SNAPSHOT
+echo "Switching version to 4.0.0-SNAPSHOT"
+for pom in pom.xml **/pom.xml
+do
+  perl -i \
+    -0pe 's@<version>3.20.0-SNAPSHOT</version>@<version>4.0.0-SNAPSHOT</version>@g;' \
+    $pom
+done
+for dir in **/src/generated/resources
+do
+  for prop in $dir/**/*.properties
+  do
+    perl -i \
+      -0pe 's@version=3.20.0-SNAPSHOT@version=4.0.0-SNAPSHOT@g;' \
+      $prop
+  done
+  for json in $dir/**/*.json
+  do
+    perl -i \
+      -0pe 's@"version": "3.20.0-SNAPSHOT"@"version": "4.0.0-SNAPSHOT"@g;' \
+      $json
+  done
+done
+git commit -a -m "Switch to 4.0.0-SNAPSHOT"
+
+# Remove OSGi support
+echo "Remove OSGi support"
+for pom in pom.xml **/pom.xml
+do
+  perl -i \
+    -0pe 's@ *<([^>]+-version-range)>[^<]+</\1> *\n@@g;' \
+    -0pe 's@ *<(camel\.osgi\.[^>]+)(>[^<]+</\1>| */>) *\n@@g;' \
+    -0pe 's@ *<!-- OSGi bundles properties --> *\n@@g;' \
+    -0pe 's@ *<(plugin|pluginExecutionFilter)>\s*<groupId>org.apache.camel</groupId>\s*<artifactId>camel-bundle-plugin</artifactId>[\s\S]*?</\1> *\n@@g;' \
+    $pom
+done
+perl -i -0pe 's@ *<module>init</module> *\n@@g;' pom.xml
+git rm -r init
+git commit -a -m "Remove OSGi support"
+
+# Switch to javax.annotation.processing.Generated
+echo "Switch to javax.annotation.processing.Generated"
+for dir in **/src/{main,test,generated}
+do
+  for java in $dir/**/*.{java,txt,vm}
+  do
+    perl -i \
+      -0pe 's@javax.annotation.Generated@javax.annotation.processing.Generated@g;' \
+      $java
+  done
+done
+git commit -a -m "Switch to javax.annotation.processing.Generated"
+
+# Add support for jakarta in checkstyle
+echo "Add support for jakarta in checkstyle"
+for file in pom.xml etc/pom.xml buildingtools/**/camel-checkstyle.xml
+do
+  perl -i \
+    `# Add support for jakarta package in checkstyle` \
+    -0pe 's@java;javax;org.w3c;org.xml;w3c;@java;jakarta;javax;org.w3c;org.xml;w3c;@g;' \
+    -0pe 's@java,javax,org.w3c,org.xml,junit@java,jakarta,javax,org.w3c,org.xml,junit@g;' \
+    $file
+done
+git commit -a -m "Add support for jakarta in checkstyle"
+
+# Switch javax packages to jakarta
+echo "Switch javax packages to jakarta"
+for dir in **/src/{main,test,generated}
+do
+  for java in $dir/**/*.java
+  do
+    perl -i \
+      -0pe 's@javax.activation@jakarta.activation@g;' \
+      -0pe 's@javax.annotation.security@jakarta.annotation.security@g;' \
+      -0pe 's@javax.annotation.sql@jakarta.annotation.sql@g;' \
+      -0pe 's@javax.annotation(?!\.processing)@jakarta.annotation@g;' \
+      -0pe 's@javax.batch.api.chunk.listener@jakarta.batch.api.chunk.listener@g;' \
+      -0pe 's@javax.batch.api.chunk@jakarta.batch.api.chunk@g;' \
+      -0pe 's@javax.batch.api.listener@jakarta.batch.api.listener@g;' \
+      -0pe 's@javax.batch.api.partition@jakarta.batch.api.partition@g;' \
+      -0pe 's@javax.batch.api@jakarta.batch.api@g;' \
+      -0pe 's@javax.batch.operations@jakarta.batch.operations@g;' \
+      -0pe 's@javax.batch.runtime.context@jakarta.batch.runtime.context@g;' \
+      -0pe 's@javax.batch.runtime@jakarta.batch.runtime@g;' \
+      -0pe 's@javax.decorator@jakarta.decorator@g;' \
+      -0pe 's@javax.ejb.embeddable@jakarta.ejb.embeddable@g;' \
+      -0pe 's@javax.ejb.spi@jakarta.ejb.spi@g;' \
+      -0pe 's@javax.ejb@jakarta.ejb@g;' \
+      -0pe 's@javax.el@jakarta.el@g;' \
+      -0pe 's@javax.enterprise.concurrent@jakarta.enterprise.concurrent@g;' \
+      -0pe 's@javax.enterprise.context.control@jakarta.enterprise.context.control@g;' \
+      -0pe 's@javax.enterprise.context.spi@jakarta.enterprise.context.spi@g;' \
+      -0pe 's@javax.enterprise.context@jakarta.enterprise.context@g;' \
+      -0pe 's@javax.enterprise.event@jakarta.enterprise.event@g;' \
+      -0pe 's@javax.enterprise.inject.literal@jakarta.enterprise.inject.literal@g;' \
+      -0pe 's@javax.enterprise.inject.se@jakarta.enterprise.inject.se@g;' \
+      -0pe 's@javax.enterprise.inject.spi.configurator@jakarta.enterprise.inject.spi.configurator@g;' \
+      -0pe 's@javax.enterprise.inject.spi@jakarta.enterprise.inject.spi@g;' \
+      -0pe 's@javax.enterprise.inject@jakarta.enterprise.inject@g;' \
+      -0pe 's@javax.enterprise.util@jakarta.enterprise.util@g;' \
+      -0pe 's@javax.faces.annotation@jakarta.faces.annotation@g;' \
+      -0pe 's@javax.faces.application@jakarta.faces.application@g;' \
+      -0pe 's@javax.faces.bean@jakarta.faces.bean@g;' \
+      -0pe 's@javax.faces.component.behavior@jakarta.faces.component.behavior@g;' \
+      -0pe 's@javax.faces.component.html@jakarta.faces.component.html@g;' \
+      -0pe 's@javax.faces.component.search@jakarta.faces.component.search@g;' \
+      -0pe 's@javax.faces.component.visit@jakarta.faces.component.visit@g;' \
+      -0pe 's@javax.faces.component@jakarta.faces.component@g;' \
+      -0pe 's@javax.faces.context@jakarta.faces.context@g;' \
+      -0pe 's@javax.faces.convert@jakarta.faces.convert@g;' \
+      -0pe 's@javax.faces.el@jakarta.faces.el@g;' \
+      -0pe 's@javax.faces.event@jakarta.faces.event@g;' \
+      -0pe 's@javax.faces.flow.builder@jakarta.faces.flow.builder@g;' \
+      -0pe 's@javax.faces.flow@jakarta.faces.flow@g;' \
+      -0pe 's@javax.faces.lifecycle@jakarta.faces.lifecycle@g;' \
+      -0pe 's@javax.faces.model@jakarta.faces.model@g;' \
+      -0pe 's@javax.faces.push@jakarta.faces.push@g;' \
+      -0pe 's@javax.faces.render@jakarta.faces.render@g;' \
+      -0pe 's@javax.faces.validator@jakarta.faces.validator@g;' \
+      -0pe 's@javax.faces.view.facelets@jakarta.faces.view.facelets@g;' \
+      -0pe 's@javax.faces.view@jakarta.faces.view@g;' \
+      -0pe 's@javax.faces.webapp@jakarta.faces.webapp@g;' \
+      -0pe 's@javax.faces@jakarta.faces@g;' \
+      -0pe 's@javax.inject@jakarta.inject@g;' \
+      -0pe 's@javax.interceptor@jakarta.interceptor@g;' \
+      -0pe 's@javax.jms@jakarta.jms@g;' \
+      -0pe 's@javax.json.bind.adapter@jakarta.json.bind.adapter@g;' \
+      -0pe 's@javax.json.bind.annotation@jakarta.json.bind.annotation@g;' \
+      -0pe 's@javax.json.bind.config@jakarta.json.bind.config@g;' \
+      -0pe 's@javax.json.bind.serializer@jakarta.json.bind.serializer@g;' \
+      -0pe 's@javax.json.bind.spi@jakarta.json.bind.spi@g;' \
+      -0pe 's@javax.json.bind@jakarta.json.bind@g;' \
+      -0pe 's@javax.json.spi@jakarta.json.spi@g;' \
+      -0pe 's@javax.json.stream@jakarta.json.stream@g;' \
+      -0pe 's@javax.json@jakarta.json@g;' \
+      -0pe 's@javax.jws.soap@jakarta.jws.soap@g;' \
+      -0pe 's@javax.jws@jakarta.jws@g;' \
+      -0pe 's@javax.mail.event@jakarta.mail.event@g;' \
+      -0pe 's@javax.mail.internet@jakarta.mail.internet@g;' \
+      -0pe 's@javax.mail.search@jakarta.mail.search@g;' \
+      -0pe 's@javax.mail.util@jakarta.mail.util@g;' \
+      -0pe 's@javax.mail@jakarta.mail@g;' \
+      -0pe 's@javax.persistence.criteria@jakarta.persistence.criteria@g;' \
+      -0pe 's@javax.persistence.metamodel@jakarta.persistence.metamodel@g;' \
+      -0pe 's@javax.persistence.spi@jakarta.persistence.spi@g;' \
+      -0pe 's@javax.persistence@jakarta.persistence@g;' \
+      -0pe 's@javax.resource.cci@jakarta.resource.cci@g;' \
+      -0pe 's@javax.resource.spi.endpoint@jakarta.resource.spi.endpoint@g;' \
+      -0pe 's@javax.resource.spi.security@jakarta.resource.spi.security@g;' \
+      -0pe 's@javax.resource.spi.work@jakarta.resource.spi.work@g;' \
+      -0pe 's@javax.resource.spi@jakarta.resource.spi@g;' \
+      -0pe 's@javax.resource@jakarta.resource@g;' \
+      -0pe 's@javax.security.auth.message.callback@jakarta.security.auth.message.callback@g;' \
+      -0pe 's@javax.security.auth.message.config@jakarta.security.auth.message.config@g;' \
+      -0pe 's@javax.security.auth.message.module@jakarta.security.auth.message.module@g;' \
+      -0pe 's@javax.security.auth.message@jakarta.security.auth.message@g;' \
+      -0pe 's@javax.security.enterprise.authentication.mechanism.http@jakarta.security.enterprise.authentication.mechanism.http@g;' \
+      -0pe 's@javax.security.enterprise.credential@jakarta.security.enterprise.credential@g;' \
+      -0pe 's@javax.security.enterprise.identitystore@jakarta.security.enterprise.identitystore@g;' \
+      -0pe 's@javax.security.enterprise@jakarta.security.enterprise@g;' \
+      -0pe 's@javax.security.jacc@jakarta.security.jacc@g;' \
+      -0pe 's@javax.servlet.annotation@jakarta.servlet.annotation@g;' \
+      -0pe 's@javax.servlet.descriptor@jakarta.servlet.descriptor@g;' \
+      -0pe 's@javax.servlet.http@jakarta.servlet.http@g;' \
+      -0pe 's@javax.servlet.jsp.el@jakarta.servlet.jsp.el@g;' \
+      -0pe 's@javax.servlet.jsp.jstl.core@jakarta.servlet.jsp.jstl.core@g;' \
+      -0pe 's@javax.servlet.jsp.jstl.fmt@jakarta.servlet.jsp.jstl.fmt@g;' \
+      -0pe 's@javax.servlet.jsp.jstl.sql@jakarta.servlet.jsp.jstl.sql@g;' \
+      -0pe 's@javax.servlet.jsp.jstl.tlv@jakarta.servlet.jsp.jstl.tlv@g;' \
+      -0pe 's@javax.servlet.jsp.jstl@jakarta.servlet.jsp.jstl@g;' \
+      -0pe 's@javax.servlet.jsp.resources@jakarta.servlet.jsp.resources@g;' \
+      -0pe 's@javax.servlet.jsp.tagext@jakarta.servlet.jsp.tagext@g;' \
+      -0pe 's@javax.servlet.jsp@jakarta.servlet.jsp@g;' \
+      -0pe 's@javax.servlet.resources@jakarta.servlet.resources@g;' \
+      -0pe 's@javax.servlet@jakarta.servlet@g;' \
+      -0pe 's@javax.transaction@jakarta.transaction@g;' \
+      -0pe 's@javax.validation.bootstrap@jakarta.validation.bootstrap@g;' \
+      -0pe 's@javax.validation.constraints@jakarta.validation.constraints@g;' \
+      -0pe 's@javax.validation.constraintvalidation@jakarta.validation.constraintvalidation@g;' \
+      -0pe 's@javax.validation.executable@jakarta.validation.executable@g;' \
+      -0pe 's@javax.validation.groups@jakarta.validation.groups@g;' \
+      -0pe 's@javax.validation.metadata@jakarta.validation.metadata@g;' \
+      -0pe 's@javax.validation.spi@jakarta.validation.spi@g;' \
+      -0pe 's@javax.validation.valueextraction@jakarta.validation.valueextraction@g;' \
+      -0pe 's@javax.validation@jakarta.validation@g;' \
+      -0pe 's@javax.websocket.server@jakarta.websocket.server@g;' \
+      -0pe 's@javax.websocket@jakarta.websocket@g;' \
+      -0pe 's@javax.ws.rs.client@jakarta.ws.rs.client@g;' \
+      -0pe 's@javax.ws.rs.container@jakarta.ws.rs.container@g;' \
+      -0pe 's@javax.ws.rs.core@jakarta.ws.rs.core@g;' \
+      -0pe 's@javax.ws.rs.ext@jakarta.ws.rs.ext@g;' \
+      -0pe 's@javax.ws.rs.sse@jakarta.ws.rs.sse@g;' \
+      -0pe 's@javax.ws.rs@jakarta.ws.rs@g;' \
+      -0pe 's@javax.xml.bind.annotation.adapters@jakarta.xml.bind.annotation.adapters@g;' \
+      -0pe 's@javax.xml.bind.annotation@jakarta.xml.bind.annotation@g;' \
+      -0pe 's@javax.xml.bind.attachment@jakarta.xml.bind.attachment@g;' \
+      -0pe 's@javax.xml.bind.helpers@jakarta.xml.bind.helpers@g;' \
+      -0pe 's@javax.xml.bind.util@jakarta.xml.bind.util@g;' \
+      -0pe 's@javax.xml.bind@jakarta.xml.bind@g;' \
+      -0pe 's@javax.xml.soap@jakarta.xml.soap@g;' \
+      -0pe 's@javax.xml.ws.handler.soap@jakarta.xml.ws.handler.soap@g;' \
+      -0pe 's@javax.xml.ws.handler@jakarta.xml.ws.handler@g;' \
+      -0pe 's@javax.xml.ws.http@jakarta.xml.ws.http@g;' \
+      -0pe 's@javax.xml.ws.soap@jakarta.xml.ws.soap@g;' \
+      -0pe 's@javax.xml.ws.spi.http@jakarta.xml.ws.spi.http@g;' \
+      -0pe 's@javax.xml.ws.spi@jakarta.xml.ws.spi@g;' \
+      -0pe 's@javax.xml.ws.wsaddressing@jakarta.xml.ws.wsaddressing@g;' \
+      -0pe 's@javax.xml.ws@jakarta.xml.ws@g;' \
+      $java
+  done
+done
+git commit -a -m "Switch javax packages to jakarta"
+
+# Jetty 11 migration
+git cherry-pick -x e5aea792291557b86b10eb84b978b381c2d94be6
+
+# Switch POMs to jakarta specs and other upgrades
+for pom in pom.xml **/pom.xml
+do
+  perl -i \
+    -0pe 's@<(jakarta-jaxb-version)>[0-9.]+</\1>@<$1>4.0.0</$1>@g;' \
+    -0pe 's@<(jaxb-api-version)>[0-9.]+</\1>@<$1>4.0.0</$1>@g;' \
+    -0pe 's@<(glassfish-jaxb-runtime-version)>[0-9.]+</\1>@<$1>4.0.1</$1>@g;' \
+    -0pe 's@<(jaxb2-maven-plugin-version)>[0-9.]+</\1>@<$1>3.1.0</$1>@g;' \
+    -0pe 's@<(jaxb-core-version)>[0-9.]+</\1>@<$1>4.0.1</$1>@g;' \
+    -0pe 's@<(jaxb-impl-version)>[0-9.]+</\1>@<$1>4.0.1</$1>@g;' \
+    -0pe 's@<(jaxb-osgi-version)>[0-9.]+</\1>@<$1>4.0.1</$1>@g;' \
+    -0pe 's@<(jaxb-jxc-version)>[0-9.]+</\1>@<$1>4.0.1</$1>@g;' \
+    -0pe 's@<(jaxb-xjc-version)>[0-9.]+</\1>@<$1>4.0.1</$1>@g;' \
+    -0pe 's@<(javax-soap-api-version)>[0-9.]+</\1>@<$1>3.0.0</$1>@g;' \
+    -0pe 's@<(jakarta-mail-version)>[0-9.]+</\1>@<$1>2.0.1</$1>@g;' \
+    -0pe 's@<(undertow-version)>[^<]+</\1>@<$1>2.3.0.Final</$1>@g;' \
+    `# Annotations` \
+    -0pe 's@<(javax-annotation-api-version)>[0-9.]+</\1>@<$1>2.1.1</$1>@g;' \
+    -0pe 's@javax-annotation-api-version@jakarta-annotation-api-version@g;' \
+    `# Spring ` \
+    -0pe 's@ *<(spring5-version)>.*?</\1> *\n@@g;' \
+    -0pe 's@spring5-version@spring-version@g;' \
+    -0pe 's@<(spring-version)>.*?</\1>@<$1>6.0.2</$1>@g;' \
+    `# CDI` \
+    -0pe 's@cdi-api-2.0-version@jakarta-enterprise-cdi-api-version@g;' \
+    -0pe 's@<(jakarta-enterprise-cdi-api-version)>.*?</\1>@<$1>4.0.1</$1>@g;' \
+    -0pe 's@(<dependency>\s*)<groupId>javax.enterprise</groupId>(\s+)<artifactId>cdi-api</artifactId>@$1<groupId>jakarta.enterprise</groupId>$2<artifactId>jakarta.enterprise.cdi-api</artifactId>@g;' \
+    `# JMS` \
+    -0pe 's@geronimo-jms-spec-version@jakarta-jms-api-version@g;' \
+    -0pe 's@<(jakarta-jms-api-version)>.*?</\1>@<$1>3.1.0</$1>@g;' \
+    -0pe 's@<(geronimo\-jms2\-spec\-version)>.*?</\1>@<$1>\${jakarta-jms-api-version}</$1>@g;' \
+    -0pe 's@(<dependency>\s*)<groupId>org.apache.geronimo.specs</groupId>(\s+)<artifactId>geronimo-jms_1.1_spec</artifactId>@$1<groupId>jakarta.jms</groupId>$2<artifactId>jakarta.jms-api</artifactId>@g;' \
+    -0pe 's@(<dependency>\s*)<groupId>org.apache.geronimo.specs</groupId>(\s+)<artifactId>geronimo-jms_2.0_spec</artifactId>@$1<groupId>jakarta.jms</groupId>$2<artifactId>jakarta.jms-api</artifactId>@g;' \
+    `# JPA` \
+    -0pe 's@geronimo-jpa-spec-version@jakarta-persistence-api-version@g;' \
+    -0pe 's@<(jakarta-persistence-api-version)>.*?</\1>@<$1>3.1.0</$1>@g;' \
+    -0pe 's@(<dependency>\s*)<groupId>org.apache.geronimo.specs</groupId>(\s+)<artifactId>geronimo-jpa_2.1_spec</artifactId>@$1<groupId>jakarta.persistence</groupId>$2<artifactId>jakarta.persistence-api</artifactId>@g;' \
+    `# JTA` \
+    -0pe 's@geronimo-jta-spec-version@jakarta-transaction-api-version@g;' \
+    -0pe 's@<(jakarta-transaction-api-version)>[0-9.]+</\1>@<$1>2.0.1</$1>@g;' \
+    -0pe 's@(<dependency>\s*)<groupId>org.apache.geronimo.specs</groupId>(\s+)<artifactId>geronimo-jta_1.1_spec</artifactId>@$1<groupId>jakarta.transaction</groupId>$2<artifactId>jakarta.transaction-api</artifactId>@g;' \
+    `# Servlet` \
+    -0pe 's@<(undertow-version)>[0-9.]+</\1>@<$1>2.3.0.Final</$1>@g;' \
+    -0pe 's@ *<(jetty9-version)>.*?</\1> *\n@@g;' \
+    -0pe 's@jetty9-version@jetty-version@g;' \
+    -0pe 's@<(jetty-version)>.*?</\1>@<$1>11.0.12</$1>@g;' \
+    -0pe 's@javax-servlet-api-version@jakarta-servlet-api-version@g;' \
+    -0pe 's@<(jakarta-servlet-api-version)>[0-9.]+</\1>@<$1>6.0.0</$1>@g;' \
+    -0pe 's@(<dependency>\s*)<groupId>javax.servlet</groupId>(\s+)<artifactId>javax.servlet-api</artifactId>@$1<groupId>jakarta.servlet</groupId>$2<artifactId>jakarta.servlet-api</artifactId>@g;' \
+    `# Other` \
+    -0pe 's@(<dependency>\s*)<groupId>javax.xml.bind</groupId>(\s+)<artifactId>jaxb-api</artifactId>@$1<groupId>jakarta.xml.bind</groupId>$2<artifactId>jakarta.xml.bind-api</artifactId>@g;' \
+    -0pe 's@(<dependency>\s*)<groupId>javax.xml.soap</groupId>(\s+)<artifactId>javax.xml.soap-api</artifactId>@$1<groupId>jakarta.xml.soap</groupId>$2<artifactId>jakarta.xml.soap-api</artifactId>@g;' \
+    -0pe 's@(<dependency>\s*)<groupId>javax.annotation</groupId>(\s+)<artifactId>javax.annotation-api</artifactId>@$1<groupId>jakarta.annotation</groupId>$2<artifactId>jakarta.annotation-api</artifactId>@g;' \
+    -0pe 's@(<dependency>\s*)<groupId>org.apache.geronimo.specs</groupId>(\s+)<artifactId>geronimo-annotation_1.0_spec</artifactId>@$1<groupId>jakarta.annotation</groupId>$2<artifactId>jakarta.annotation-api</artifactId>@g;' \
+    -0pe 's@(<dependency>\s*)<groupId>org.apache.geronimo.specs</groupId>(\s+)<artifactId>geronimo-json_1.1_spec</artifactId>@$1<groupId>jakarta.json</groupId>$2<artifactId>jakarta.json-api</artifactId>@g;' \
+    -0pe 's@(<dependency>\s*)<groupId>org.apache.geronimo.specs</groupId>(\s+)<artifactId>geronimo-jsonb_1.0_spec</artifactId>@$1<groupId>jakarta.json.bind</groupId>$2<artifactId>jakarta.json.bind-api</artifactId>@g;' \
+    $pom
+done
+perl -i -0pe 's@(( *)<jaxb-xjc-version>.*</jaxb-xjc-version>)@$1\n$2<jaxb-jxc-version>4.0.1</jaxb-jxc-version>@g;' pom.xml
+perl -i -0pe 's@(<plugin>\s*<groupId>org.codehaus.mojo</groupId>\s*<artifactId>jaxb2-maven-plugin</artifactId>[\s\S]*?)(</dependencies>\s*</plugin>)@$1    <dependency>
+                            <groupId>com.sun.xml.bind</groupId>
+                            <artifactId>jaxb-xjc</artifactId>
+                            <version>\${jaxb-xjc-version}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>com.sun.xml.bind</groupId>
+                            <artifactId>jaxb-jxc</artifactId>
+                            <version>\${jaxb-jxc-version}</version>
+                        </dependency>
+                   $2@g;' parent/pom.xml
+perl -i -0pe 's@ *<dependency>\s+<groupId>jakarta.jms</groupId>\s+<artifactId>jakarta.jms-api</artifactId>\s+<version>\${geronimo-jms2-spec-version}</version>\s+</dependency> *\n@@g;' parent/pom.xml
+
+# Spring
+perl -i -0pe 's@InstantiationAwareBeanPostProcessorAdapter@SmartInstantiationAwareBeanPostProcessor@g;' \
+        -0pe 's@extends@implements@g;' \
+        components/camel-spring-xml/src/test/java/org/apache/camel/spring/postprocessor/MagicAnnotationPostProcessor.java
+# CDI
+for java in components/camel-cdi/src/**/*.java
+do
+  perl -i \
+       -0pe 's@manager\.createInjectionTarget\((.*?)\)\;@manager\.getInjectionTargetFactory(\n                $1).createInjectionTarget(null)\;@g;' \
+       -0pe 's/ *.Override\s+public boolean isNullable\(\) {\s+return [^;]+;\s+} *\n *\n//g;' \
+       -0pe 's/manager.fireEvent\(([a-z]+), (.*?)\);/manager.getEvent().select($2).fire($1);/g;' \
+       -0pe 's/manager.fireEvent\(([a-z]+)\);/manager.getEvent().fire($1);/g;' \
+       $java
+done
+# JAXB
+perl -i -0pe 's@com.sun.xml.bind.marshaller@org.glassfish.jaxb.runtime.marshaller@g;' \
+        components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/mapper/DefaultNamespacePrefixMapper.java
+
+git commit -a -m "Upgrade dependencies"
+
+git push --force origin jakarta-rewritten
+
+#mvn install -DskipTests
+#git commit -a -m "Regen"


[camel] 08/08: Upgrade dependencies

Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch jakarta-rewritten
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 61163081ba4545588e865577ba1ea7eaaa23b35b
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Nov 25 22:05:10 2022 +0100

    Upgrade dependencies
---
 .../src/main/resources/archetype-resources/pom.xml |  4 +-
 camel-dependencies/pom.xml                         | 32 ++++-----
 components/camel-activemq/pom.xml                  |  4 +-
 components/camel-amqp/pom.xml                      |  4 +-
 components/camel-asn1/pom.xml                      |  4 +-
 components/camel-atmosphere-websocket/pom.xml      |  6 +-
 components/camel-cdi-jta/pom.xml                   |  6 +-
 components/camel-cdi-main/pom.xml                  |  6 +-
 components/camel-cdi/pom.xml                       | 12 ++--
 .../java/org/apache/camel/cdi/BeanDelegate.java    |  5 --
 .../org/apache/camel/cdi/CdiCamelExtension.java    |  2 +-
 .../org/apache/camel/cdi/CdiEventEndpoint.java     |  3 +-
 .../org/apache/camel/cdi/CdiEventNotifier.java     |  4 +-
 .../java/org/apache/camel/cdi/SyntheticBean.java   |  5 --
 components/camel-cometd/pom.xml                    |  4 +-
 components/camel-cxf/camel-cxf-common/pom.xml      |  6 +-
 components/camel-cxf/camel-cxf-rest/pom.xml        |  6 +-
 components/camel-cxf/camel-cxf-soap/pom.xml        |  6 +-
 .../camel-cxf/camel-cxf-spring-common/pom.xml      |  6 +-
 components/camel-cxf/camel-cxf-transport/pom.xml   |  4 +-
 components/camel-dozer/pom.xml                     |  4 +-
 components/camel-grpc/pom.xml                      |  4 +-
 components/camel-http-common/pom.xml               |  6 +-
 components/camel-http/pom.xml                      |  6 +-
 .../jaxb/mapper/DefaultNamespacePrefixMapper.java  |  2 +-
 components/camel-jbpm/pom.xml                      |  4 +-
 components/camel-jetty-common/pom.xml              |  6 +-
 components/camel-jetty/pom.xml                     | 18 ++---
 components/camel-jms/pom.xml                       |  4 +-
 components/camel-johnzon/pom.xml                   |  4 +-
 components/camel-jooq/pom.xml                      |  6 +-
 components/camel-jpa/pom.xml                       |  4 +-
 components/camel-jsonb/pom.xml                     |  8 +--
 components/camel-jta/pom.xml                       |  4 +-
 .../camel-microprofile-health/pom.xml              |  4 +-
 .../camel-microprofile-metrics/pom.xml             | 10 +--
 components/camel-netty-http/pom.xml                |  4 +-
 components/camel-openapi-java/pom.xml              |  4 +-
 components/camel-resteasy/pom.xml                  |  6 +-
 .../camel-salesforce-component/pom.xml             | 18 ++---
 .../camel-salesforce-maven-plugin/pom.xml          |  6 +-
 components/camel-servlet/pom.xml                   |  6 +-
 components/camel-sjms/pom.xml                      |  4 +-
 components/camel-sjms2/pom.xml                     |  4 +-
 components/camel-spring-redis/pom.xml              |  4 +-
 components/camel-spring-ws/pom.xml                 | 14 ++--
 components/camel-spring-xml/pom.xml                |  4 +-
 .../MagicAnnotationPostProcessor.java              |  4 +-
 .../camel-test/camel-test-spring-junit5/pom.xml    |  2 +-
 components/camel-test/camel-test-spring/pom.xml    |  2 +-
 components/camel-undertow/pom.xml                  |  8 +--
 components/camel-websocket/pom.xml                 |  4 +-
 core/camel-core/pom.xml                            |  4 +-
 dsl/camel-jbang/camel-jbang-core/pom.xml           |  6 +-
 dsl/camel-xml-jaxb-dsl-test/cdi/pom.xml            |  6 +-
 .../camel-yaml-dsl-maven-plugin/pom.xml            |  4 +-
 parent/pom.xml                                     | 83 +++++++++++-----------
 pom.xml                                            | 11 +--
 tests/camel-itest-cdi/pom.xml                      |  6 +-
 tests/camel-itest/pom.xml                          |  4 +-
 tooling/maven/camel-package-maven-plugin/pom.xml   |  4 +-
 tooling/maven/camel-restdsl-openapi-plugin/pom.xml |  4 +-
 .../src/it/simple-dto-v3/pom.xml                   |  4 +-
 .../src/it/simple-dto/pom.xml                      |  4 +-
 .../src/it/simple-xml-dto-v3/pom.xml               |  4 +-
 .../src/it/simple-xml-dto/pom.xml                  |  4 +-
 .../src/it/simple-yaml-dto-v3/pom.xml              |  4 +-
 tooling/maven/camel-restdsl-swagger-plugin/pom.xml |  4 +-
 .../src/it/simple-dto/pom.xml                      |  4 +-
 .../src/it/simple-xml-dto/pom.xml                  |  4 +-
 tooling/openapi-rest-dsl-generator/pom.xml         |  4 +-
 tooling/swagger-rest-dsl-generator/pom.xml         |  4 +-
 72 files changed, 241 insertions(+), 248 deletions(-)

diff --git a/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml
index dc092b4431a..30a5a9afccd 100644
--- a/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml
@@ -53,8 +53,8 @@
 
     <!-- CDI API -->
     <dependency>
-      <groupId>javax.enterprise</groupId>
-      <artifactId>cdi-api</artifactId>
+      <groupId>jakarta.enterprise</groupId>
+      <artifactId>jakarta.enterprise.cdi-api</artifactId>
       <version>${cdi-api-version}</version>
       <scope>provided</scope>
     </dependency>
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index ae8959886c4..91d9b50a149 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -95,7 +95,7 @@
     <camel.surefire.reuseForks>true</camel.surefire.reuseForks>
     <cassandra-driver-version>4.15.0</cassandra-driver-version>
     <cassandra-version>4.0.6</cassandra-version>
-    <cdi-api-2.0-version>2.0</cdi-api-2.0-version>
+    <jakarta-enterprise-cdi-api-version>4.0.1</jakarta-enterprise-cdi-api-version>
     <cglib-version>3.2.12</cglib-version>
     <checkstyle.failOnViolation>false</checkstyle.failOnViolation>
     <chunk-templates-version>3.6.2</chunk-templates-version>
@@ -185,15 +185,15 @@
     <geronimo-j2ee-management-spec-version>1.1</geronimo-j2ee-management-spec-version>
     <geronimo-jcdi-1.0-spec-version>1.0</geronimo-jcdi-1.0-spec-version>
     <geronimo-jcdi-1.1-spec-version>1.0</geronimo-jcdi-1.1-spec-version>
-    <geronimo-jms-spec-version>1.1.1</geronimo-jms-spec-version>
-    <geronimo-jms2-spec-version>1.0-alpha-2</geronimo-jms2-spec-version>
-    <geronimo-jpa-spec-version>1.0-alpha-1</geronimo-jpa-spec-version>
+    <jakarta-jms-api-version>3.1.0</jakarta-jms-api-version>
+    <geronimo-jms2-spec-version>${jakarta-jms-api-version}</geronimo-jms2-spec-version>
+    <jakarta-persistence-api-version>3.1.0</jakarta-persistence-api-version>
     <geronimo-json-spec-version>1.5</geronimo-json-spec-version>
     <geronimo-jsonb-spec-version>1.4</geronimo-jsonb-spec-version>
-    <geronimo-jta-spec-version>1.1.1</geronimo-jta-spec-version>
+    <jakarta-transaction-api-version>2.0.1</jakarta-transaction-api-version>
     <geronimo-ws-metadata-spec-version>1.1.3</geronimo-ws-metadata-spec-version>
     <glassfish-javax-json>1.0.4</glassfish-javax-json>
-    <glassfish-jaxb-runtime-version>2.3.6</glassfish-jaxb-runtime-version>
+    <glassfish-jaxb-runtime-version>4.0.1</glassfish-jaxb-runtime-version>
     <gmavenplus-plugin-version>1.13.1</gmavenplus-plugin-version>
     <google-api-client-version>1.32.1</google-api-client-version>
     <google-api-services-calendar-version>v3-rev20211229-1.32.1</google-api-services-calendar-version>
@@ -260,8 +260,8 @@
     <jackson2-version>2.14.1</jackson2-version>
     <jakarta-api-version>2.1.5</jakarta-api-version>
     <jakarta-cdi-api-version>2.0.2</jakarta-cdi-api-version>
-    <jakarta-jaxb-version>2.3.3</jakarta-jaxb-version>
-    <jakarta-mail-version>1.6.7</jakarta-mail-version>
+    <jakarta-jaxb-version>4.0.0</jakarta-jaxb-version>
+    <jakarta-mail-version>2.0.1</jakarta-mail-version>
     <jakarta.el-version>3.0.3</jakarta.el-version>
     <jandex-version>3.0.3</jandex-version>
     <jansi-version>2.4.0</jansi-version>
@@ -275,13 +275,13 @@
     <javapoet-version>1.11.1</javapoet-version>
     <javassist-version>3.28.0-GA</javassist-version>
     <javax-activation-version>1.2.0</javax-activation-version>
-    <javax-annotation-api-version>1.3.2</javax-annotation-api-version>
+    <jakarta-annotation-api-version>2.1.1</jakarta-annotation-api-version>
     <javax-el-api-hibernate-validator-version>3.0.1-b04</javax-el-api-hibernate-validator-version>
     <javax-el-hibernate-validator-version>3.0.1-b10</javax-el-hibernate-validator-version>
     <javax-el3-version>3.0.0</javax-el3-version>
-    <javax-servlet-api-version>3.1.0</javax-servlet-api-version>
-    <javax-soap-api-version>1.4.0</javax-soap-api-version>
-    <jaxb2-maven-plugin-version>2.5.0</jaxb2-maven-plugin-version>
+    <jakarta-servlet-api-version>6.0.0</jakarta-servlet-api-version>
+    <javax-soap-api-version>3.0.0</javax-soap-api-version>
+    <jaxb2-maven-plugin-version>3.1.0</jaxb2-maven-plugin-version>
     <jaxws-api-version>2.3.0</jaxws-api-version>
     <jboss-el-api_3.0_spec-version>2.0.0.Final</jboss-el-api_3.0_spec-version>
     <jboss-logging-version>3.4.3.Final</jboss-logging-version>
@@ -301,8 +301,7 @@
     <jettison-version>1.5.2</jettison-version>
     <jetty-plugin-version>${jetty-version}</jetty-plugin-version>
     <jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>
-    <jetty-version>${jetty9-version}</jetty-version>
-    <jetty9-version>9.4.49.v20220914</jetty9-version>
+    <jetty-version>11.0.12</jetty-version>
     <jgit-version>6.3.0.202209071007-r</jgit-version>
     <jgroups-raft-leveldbjni-version>1.8</jgroups-raft-leveldbjni-version>
     <jgroups-raft-mapdb-version>1.0.8</jgroups-raft-mapdb-version>
@@ -492,9 +491,8 @@
     <spring-rabbitmq-version>2.4.7</spring-rabbitmq-version>
     <spring-security-version>5.7.5</spring-security-version>
     <spring-vault-core-version>2.3.2</spring-vault-core-version>
-    <spring-version>${spring5-version}</spring-version>
+    <spring-version>6.0.2</spring-version>
     <spring-ws-version>3.1.4</spring-ws-version>
-    <spring5-version>5.3.24</spring5-version>
     <sql-maven-plugin-version>1.5</sql-maven-plugin-version>
     <squareup-okhttp-version>3.14.9</squareup-okhttp-version>
     <squareup-okio-version>1.17.2</squareup-okio-version>
@@ -512,7 +510,7 @@
     <trimStackTrace>false</trimStackTrace>
     <twilio-version>7.55.3</twilio-version>
     <twitter4j-version>4.0.7</twitter4j-version>
-    <undertow-version>2.2.19.Final</undertow-version>
+    <undertow-version>2.3.0.Final</undertow-version>
     <univocity-parsers-version>2.9.1</univocity-parsers-version>
     <validation-api-version>2.0.1.Final</validation-api-version>
     <vavr-version>0.10.2</vavr-version>
diff --git a/components/camel-activemq/pom.xml b/components/camel-activemq/pom.xml
index c3612b19b84..f8dd69281b8 100644
--- a/components/camel-activemq/pom.xml
+++ b/components/camel-activemq/pom.xml
@@ -67,8 +67,8 @@
             <artifactId>activemq-pool</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
             <version>1.1.1</version>
             <optional>true</optional>
         </dependency>
diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml
index 289e975cb6a..960ae6f46e2 100644
--- a/components/camel-amqp/pom.xml
+++ b/components/camel-amqp/pom.xml
@@ -43,8 +43,8 @@
             <artifactId>camel-jms</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
+            <groupId>jakarta.jms</groupId>
+            <artifactId>jakarta.jms-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/components/camel-asn1/pom.xml b/components/camel-asn1/pom.xml
index e8310c36c57..4cae5dd1d05 100644
--- a/components/camel-asn1/pom.xml
+++ b/components/camel-asn1/pom.xml
@@ -87,8 +87,8 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
             <version>${jaxb-api-version}</version>
             <optional>true</optional>
         </dependency>
diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml
index be86b000280..3861a8c7fb0 100644
--- a/components/camel-atmosphere-websocket/pom.xml
+++ b/components/camel-atmosphere-websocket/pom.xml
@@ -46,9 +46,9 @@
             <artifactId>camel-servlet</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax-servlet-api-version}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta-servlet-api-version}</version>
         </dependency>
 
         <!--  atmosphere -->
diff --git a/components/camel-cdi-jta/pom.xml b/components/camel-cdi-jta/pom.xml
index 3159d5caa47..f0d42860b4d 100644
--- a/components/camel-cdi-jta/pom.xml
+++ b/components/camel-cdi-jta/pom.xml
@@ -50,9 +50,9 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
-            <version>${cdi-api-2.0-version}</version>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <version>${jakarta-enterprise-cdi-api-version}</version>
         </dependency>
         <dependency>
             <groupId>javax.transaction</groupId>
diff --git a/components/camel-cdi-main/pom.xml b/components/camel-cdi-main/pom.xml
index 90bb9fae931..c45a787d751 100644
--- a/components/camel-cdi-main/pom.xml
+++ b/components/camel-cdi-main/pom.xml
@@ -50,9 +50,9 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
-            <version>${cdi-api-2.0-version}</version>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <version>${jakarta-enterprise-cdi-api-version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index f249986d64e..899a98cafd1 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -170,9 +170,9 @@
 
         <!-- provided dependencies -->
         <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
-            <version>${cdi-api-2.0-version}</version>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <version>${jakarta-enterprise-cdi-api-version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -295,9 +295,9 @@
                 <!-- provided dependencies -->
 
                 <dependency>
-                    <groupId>javax.enterprise</groupId>
-                    <artifactId>cdi-api</artifactId>
-                    <version>${cdi-api-2.0-version}</version>
+                    <groupId>jakarta.enterprise</groupId>
+                    <artifactId>jakarta.enterprise.cdi-api</artifactId>
+                    <version>${jakarta-enterprise-cdi-api-version}</version>
                     <scope>provided</scope>
                 </dependency>
 
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java
index 68dfff82528..4df66f73f4d 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java
@@ -83,11 +83,6 @@ final class BeanDelegate<T> implements Bean<T> {
         return delegate.getInjectionPoints();
     }
 
-    @Override
-    public boolean isNullable() {
-        return delegate.isNullable();
-    }
-
     @Override
     public T create(CreationalContext<T> creationalContext) {
         return delegate.create(creationalContext);
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
index 3714418bd95..917d1e453e8 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
@@ -410,7 +410,7 @@ public class CdiCamelExtension implements Extension {
 
     private void afterDeploymentValidation(@Observes AfterDeploymentValidation adv, BeanManager manager) {
         // Send event for Camel CDI configuration
-        manager.fireEvent(configuration);
+        manager.getEvent().fire(configuration);
         configuration.unmodifiable();
 
         Collection<CamelContext> contexts = new ArrayList<>();
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java
index c42793df9c8..f44648584b9 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java
@@ -156,7 +156,8 @@ public final class CdiEventEndpoint<T> extends DefaultEndpoint {
             }
         }
 
-        InjectionTarget<AnyEvent> target = manager.createInjectionTarget(manager.createAnnotatedType(AnyEvent.class));
+        InjectionTarget<AnyEvent> target = manager.getInjectionTargetFactory(
+                manager.createAnnotatedType(AnyEvent.class)).createInjectionTarget(null);
         CreationalContext<AnyEvent> ctx = manager.createCreationalContext(null);
         AnyEvent instance = target.produce(ctx);
         target.inject(instance, ctx);
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java
index 29ed0d13263..56d90ba760e 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java
@@ -56,9 +56,9 @@ final class CdiEventNotifier extends EventNotifierSupport {
             List<Annotation> annotations = new ArrayList<>();
             Collections.addAll(annotations, qualifiers);
             annotations.add(NamedLiteral.of(id));
-            manager.fireEvent(event, annotations.toArray(new Annotation[0]));
+            manager.getEvent().select(annotations.toArray(new Annotation[0])).fire(event);
         } else {
-            manager.fireEvent(event, qualifiers);
+            manager.getEvent().select(qualifiers).fire(event);
         }
     }
 
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java
index 825317bb811..7e11cf55205 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java
@@ -84,11 +84,6 @@ class SyntheticBean<T> extends SyntheticBeanAttributes<T> implements Bean<T>, Pa
         return Collections.emptySet();
     }
 
-    @Override
-    public boolean isNullable() {
-        return false;
-    }
-
     @Override
     public String toString() {
         return toString.apply(this);
diff --git a/components/camel-cometd/pom.xml b/components/camel-cometd/pom.xml
index ee7b7a7cd92..69629dbb43d 100644
--- a/components/camel-cometd/pom.xml
+++ b/components/camel-cometd/pom.xml
@@ -70,8 +70,8 @@
             <version>${cometd-java-server}</version>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
 
         <!-- Test Dependencies -->
diff --git a/components/camel-cxf/camel-cxf-common/pom.xml b/components/camel-cxf/camel-cxf-common/pom.xml
index 04e2e075464..c0fe544daab 100644
--- a/components/camel-cxf/camel-cxf-common/pom.xml
+++ b/components/camel-cxf/camel-cxf-common/pom.xml
@@ -62,9 +62,9 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax-servlet-api-version}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta-servlet-api-version}</version>
         </dependency>
 
         <dependency>
diff --git a/components/camel-cxf/camel-cxf-rest/pom.xml b/components/camel-cxf/camel-cxf-rest/pom.xml
index 29babefc081..1aaa7667e7b 100644
--- a/components/camel-cxf/camel-cxf-rest/pom.xml
+++ b/components/camel-cxf/camel-cxf-rest/pom.xml
@@ -55,9 +55,9 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax-servlet-api-version}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta-servlet-api-version}</version>
         </dependency>
 
         <dependency>
diff --git a/components/camel-cxf/camel-cxf-soap/pom.xml b/components/camel-cxf/camel-cxf-soap/pom.xml
index f69dcac0d6e..5cef0ba6240 100644
--- a/components/camel-cxf/camel-cxf-soap/pom.xml
+++ b/components/camel-cxf/camel-cxf-soap/pom.xml
@@ -59,9 +59,9 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax-servlet-api-version}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta-servlet-api-version}</version>
         </dependency>
 
         <dependency>
diff --git a/components/camel-cxf/camel-cxf-spring-common/pom.xml b/components/camel-cxf/camel-cxf-spring-common/pom.xml
index 3b58c7287ac..5d44f40bcca 100644
--- a/components/camel-cxf/camel-cxf-spring-common/pom.xml
+++ b/components/camel-cxf/camel-cxf-spring-common/pom.xml
@@ -62,9 +62,9 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax-servlet-api-version}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta-servlet-api-version}</version>
         </dependency>
 
         <dependency>
diff --git a/components/camel-cxf/camel-cxf-transport/pom.xml b/components/camel-cxf/camel-cxf-transport/pom.xml
index 2d1a67a23ba..6502eb76945 100644
--- a/components/camel-cxf/camel-cxf-transport/pom.xml
+++ b/components/camel-cxf/camel-cxf-transport/pom.xml
@@ -60,8 +60,8 @@
 
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
 
         <!-- for testing -->
diff --git a/components/camel-dozer/pom.xml b/components/camel-dozer/pom.xml
index ecb662aa891..bb7c37884fe 100644
--- a/components/camel-dozer/pom.xml
+++ b/components/camel-dozer/pom.xml
@@ -80,8 +80,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index a5bbd071b83..44d74208baf 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -143,8 +143,8 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/components/camel-http-common/pom.xml b/components/camel-http-common/pom.xml
index 83b78299a67..bb0b50b7bec 100644
--- a/components/camel-http-common/pom.xml
+++ b/components/camel-http-common/pom.xml
@@ -56,9 +56,9 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax-servlet-api-version}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta-servlet-api-version}</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/components/camel-http/pom.xml b/components/camel-http/pom.xml
index 41f8817b81d..fc4f7e90233 100644
--- a/components/camel-http/pom.xml
+++ b/components/camel-http/pom.xml
@@ -50,9 +50,9 @@
             <artifactId>camel-file</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax-servlet-api-version}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta-servlet-api-version}</version>
         </dependency>
 
         <dependency>
diff --git a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/mapper/DefaultNamespacePrefixMapper.java b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/mapper/DefaultNamespacePrefixMapper.java
index ba1d5addc6e..01cdf60618f 100644
--- a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/mapper/DefaultNamespacePrefixMapper.java
+++ b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/mapper/DefaultNamespacePrefixMapper.java
@@ -18,7 +18,7 @@ package org.apache.camel.converter.jaxb.mapper;
 
 import java.util.Map;
 
-import com.sun.xml.bind.marshaller.NamespacePrefixMapper;
+import org.glassfish.jaxb.runtime.marshaller.NamespacePrefixMapper;
 import org.apache.camel.converter.jaxb.JaxbNamespacePrefixMapper;
 
 /**
diff --git a/components/camel-jbpm/pom.xml b/components/camel-jbpm/pom.xml
index 5ad5faa8f82..1d4bc389861 100644
--- a/components/camel-jbpm/pom.xml
+++ b/components/camel-jbpm/pom.xml
@@ -112,8 +112,8 @@
             <version>${jboss-logging-version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
+            <groupId>jakarta.jms</groupId>
+            <artifactId>jakarta.jms-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/components/camel-jetty-common/pom.xml b/components/camel-jetty-common/pom.xml
index d3f3df86518..36d3ae5e531 100644
--- a/components/camel-jetty-common/pom.xml
+++ b/components/camel-jetty-common/pom.xml
@@ -47,9 +47,9 @@
             <artifactId>camel-http-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax-servlet-api-version}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta-servlet-api-version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
diff --git a/components/camel-jetty/pom.xml b/components/camel-jetty/pom.xml
index 9a6f516e048..f366b010652 100644
--- a/components/camel-jetty/pom.xml
+++ b/components/camel-jetty/pom.xml
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>${jetty9-version}</version>
+            <version>${jetty-version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.eclipse.jetty.orbit</groupId>
@@ -64,32 +64,32 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlet</artifactId>
-            <version>${jetty9-version}</version>
+            <version>${jetty-version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-security</artifactId>
-            <version>${jetty9-version}</version>
+            <version>${jetty-version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlets</artifactId>
-            <version>${jetty9-version}</version>
+            <version>${jetty-version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-client</artifactId>
-            <version>${jetty9-version}</version>
+            <version>${jetty-version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-jmx</artifactId>
-            <version>${jetty9-version}</version>
+            <version>${jetty-version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-util</artifactId>
-            <version>${jetty9-version}</version>
+            <version>${jetty-version}</version>
         </dependency>
 
         <!-- test dependencies -->
@@ -169,8 +169,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml
index 13538c4de2e..c3b38eef683 100644
--- a/components/camel-jms/pom.xml
+++ b/components/camel-jms/pom.xml
@@ -70,8 +70,8 @@
         <!-- either use JMS 1.1 or 2.0 provided by JMS client -->
         <!-- here we use JMS 2.0 API but using JMS 1.1 should work as well -->
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_2.0_spec</artifactId>
+            <groupId>jakarta.jms</groupId>
+            <artifactId>jakarta.jms-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/components/camel-johnzon/pom.xml b/components/camel-johnzon/pom.xml
index 746f2ba87c1..96896d898ee 100644
--- a/components/camel-johnzon/pom.xml
+++ b/components/camel-johnzon/pom.xml
@@ -51,8 +51,8 @@
             <version>${johnzon-version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-json_1.1_spec</artifactId>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-api</artifactId>
             <version>${geronimo-json-spec-version}</version>
             <scope>compile</scope>
         </dependency>
diff --git a/components/camel-jooq/pom.xml b/components/camel-jooq/pom.xml
index c64ff9ce247..b8a7cb7452b 100644
--- a/components/camel-jooq/pom.xml
+++ b/components/camel-jooq/pom.xml
@@ -49,9 +49,9 @@
         </dependency>
         <!-- jooq needs this API for its source code generator -->
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>${javax-annotation-api-version}</version>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>${jakarta-annotation-api-version}</version>
         </dependency>
         <dependency>
             <groupId>commons-dbcp</groupId>
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index 9c22cd2b7d8..84e6d966c42 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -53,8 +53,8 @@
             <artifactId>spring-orm</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_2.1_spec</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
diff --git a/components/camel-jsonb/pom.xml b/components/camel-jsonb/pom.xml
index 466192faf9b..e171cda2627 100644
--- a/components/camel-jsonb/pom.xml
+++ b/components/camel-jsonb/pom.xml
@@ -37,13 +37,13 @@
             <artifactId>camel-support</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-json_1.1_spec</artifactId>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-api</artifactId>
             <version>${geronimo-json-spec-version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jsonb_1.0_spec</artifactId>
+            <groupId>jakarta.json.bind</groupId>
+            <artifactId>jakarta.json.bind-api</artifactId>
             <version>${geronimo-jsonb-spec-version}</version>
         </dependency>
 
diff --git a/components/camel-jta/pom.xml b/components/camel-jta/pom.xml
index 7e444abf7c8..69da967123b 100644
--- a/components/camel-jta/pom.xml
+++ b/components/camel-jta/pom.xml
@@ -49,8 +49,8 @@
             <artifactId>camel-core-engine</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jta_1.1_spec</artifactId>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/components/camel-microprofile/camel-microprofile-health/pom.xml b/components/camel-microprofile/camel-microprofile-health/pom.xml
index f1800dab34e..f4f4aa57ac6 100644
--- a/components/camel-microprofile/camel-microprofile-health/pom.xml
+++ b/components/camel-microprofile/camel-microprofile-health/pom.xml
@@ -70,8 +70,8 @@
 
         <!-- JSON support for smallrye-health -->
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-json_1.1_spec</artifactId>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-api</artifactId>
             <version>${geronimo-json-spec-version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/components/camel-microprofile/camel-microprofile-metrics/pom.xml b/components/camel-microprofile/camel-microprofile-metrics/pom.xml
index 316682222a2..5379ca89888 100644
--- a/components/camel-microprofile/camel-microprofile-metrics/pom.xml
+++ b/components/camel-microprofile/camel-microprofile-metrics/pom.xml
@@ -52,9 +52,9 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>${javax-annotation-api-version}</version>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>${jakarta-annotation-api-version}</version>
         </dependency>
         
         <!-- testing -->
@@ -83,8 +83,8 @@
 
         <!-- JSON support for smallrye-metrics -->
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-json_1.1_spec</artifactId>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-api</artifactId>
             <version>${geronimo-json-spec-version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/components/camel-netty-http/pom.xml b/components/camel-netty-http/pom.xml
index 5e5e2c68801..d3bf3cc50ae 100644
--- a/components/camel-netty-http/pom.xml
+++ b/components/camel-netty-http/pom.xml
@@ -157,8 +157,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/components/camel-openapi-java/pom.xml b/components/camel-openapi-java/pom.xml
index eae9aac09e6..ae6a764a603 100644
--- a/components/camel-openapi-java/pom.xml
+++ b/components/camel-openapi-java/pom.xml
@@ -85,8 +85,8 @@
 
         <!-- servlet api -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
diff --git a/components/camel-resteasy/pom.xml b/components/camel-resteasy/pom.xml
index d1705ba367f..2fa7dcae0c7 100644
--- a/components/camel-resteasy/pom.xml
+++ b/components/camel-resteasy/pom.xml
@@ -60,9 +60,9 @@
                 <version>${resteasy-version}</version>
             </dependency>
             <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>javax.servlet-api</artifactId>
-                <version>${javax-servlet-api-version}</version>
+                <groupId>jakarta.servlet</groupId>
+                <artifactId>jakarta.servlet-api</artifactId>
+                <version>${jakarta-servlet-api-version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml
index ae67073f42d..5a345e77e2a 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -47,22 +47,22 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-client</artifactId>
-            <version>${jetty9-version}</version>
+            <version>${jetty-version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-util</artifactId>
-            <version>${jetty9-version}</version>
+            <version>${jetty-version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-util-ajax</artifactId>
-            <version>${jetty9-version}</version>
+            <version>${jetty-version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-io</artifactId>
-            <version>${jetty9-version}</version>
+            <version>${jetty-version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -127,8 +127,8 @@
             <version>${commons-lang3-version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
@@ -172,19 +172,19 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>${jetty9-version}</version>
+            <version>${jetty-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlet</artifactId>
-            <version>${jetty9-version}</version>
+            <version>${jetty-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-proxy</artifactId>
-            <version>${jetty9-version}</version>
+            <version>${jetty-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
index 794909c1945..c2359b4fa05 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
@@ -140,19 +140,19 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>${jetty9-version}</version>
+            <version>${jetty-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlet</artifactId>
-            <version>${jetty9-version}</version>
+            <version>${jetty-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-proxy</artifactId>
-            <version>${jetty9-version}</version>
+            <version>${jetty-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml
index 407213ce0ce..b61b6e34ed9 100644
--- a/components/camel-servlet/pom.xml
+++ b/components/camel-servlet/pom.xml
@@ -46,9 +46,9 @@
             <artifactId>camel-http-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax-servlet-api-version}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta-servlet-api-version}</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/components/camel-sjms/pom.xml b/components/camel-sjms/pom.xml
index 886e772212f..c30fe751573 100644
--- a/components/camel-sjms/pom.xml
+++ b/components/camel-sjms/pom.xml
@@ -42,8 +42,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
+            <groupId>jakarta.jms</groupId>
+            <artifactId>jakarta.jms-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
diff --git a/components/camel-sjms2/pom.xml b/components/camel-sjms2/pom.xml
index 68eade8464d..649e9709164 100644
--- a/components/camel-sjms2/pom.xml
+++ b/components/camel-sjms2/pom.xml
@@ -46,8 +46,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_2.0_spec</artifactId>
+            <groupId>jakarta.jms</groupId>
+            <artifactId>jakarta.jms-api</artifactId>
             <version>${geronimo-jms2-spec-version}</version>
             <scope>provided</scope>
         </dependency>
diff --git a/components/camel-spring-redis/pom.xml b/components/camel-spring-redis/pom.xml
index 3e44df75e22..f2677f80eab 100644
--- a/components/camel-spring-redis/pom.xml
+++ b/components/camel-spring-redis/pom.xml
@@ -67,8 +67,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml
index 9912b5e7cbd..9426a67de76 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -57,9 +57,9 @@
             <artifactId>camel-xslt-saxon</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax-servlet-api-version}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta-servlet-api-version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -80,12 +80,12 @@
             <version>${spring-ws-version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.xml.soap</groupId>
-            <artifactId>javax.xml.soap-api</artifactId>
+            <groupId>jakarta.xml.soap</groupId>
+            <artifactId>jakarta.xml.soap-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <!-- test dependencies -->
diff --git a/components/camel-spring-xml/pom.xml b/components/camel-spring-xml/pom.xml
index e36b8a15410..7b1fb7dcabe 100644
--- a/components/camel-spring-xml/pom.xml
+++ b/components/camel-spring-xml/pom.xml
@@ -140,8 +140,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <!-- logging for testing -->
diff --git a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/postprocessor/MagicAnnotationPostProcessor.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/postprocessor/MagicAnnotationPostProcessor.java
index ad504a6e5d1..3d1bcf6b173 100644
--- a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/postprocessor/MagicAnnotationPostProcessor.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/postprocessor/MagicAnnotationPostProcessor.java
@@ -21,7 +21,7 @@ import java.lang.reflect.Field;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.InstantiationAwareBeanPostProcessorAdapter;
+import org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ReflectionUtils;
 
@@ -29,7 +29,7 @@ import org.springframework.util.ReflectionUtils;
  * Trivial post processor which sets the value of the annotation to the field it is applied to
  */
 @Component
-public class MagicAnnotationPostProcessor extends InstantiationAwareBeanPostProcessorAdapter {
+public class MagicAnnotationPostProcessor implements SmartInstantiationAwareBeanPostProcessor {
 
     protected Logger log = LoggerFactory.getLogger(getClass());
 
diff --git a/components/camel-test/camel-test-spring-junit5/pom.xml b/components/camel-test/camel-test-spring-junit5/pom.xml
index e383a7796eb..f951ab5279d 100644
--- a/components/camel-test/camel-test-spring-junit5/pom.xml
+++ b/components/camel-test/camel-test-spring-junit5/pom.xml
@@ -36,7 +36,7 @@
         <firstVersion>3.0.0</firstVersion>
         <label>testing,java,spring</label>
         <title>Test Spring JUnit5</title>
-        <spring-version>${spring5-version}</spring-version>
+        <spring-version>6.0.2</spring-version>
     </properties>
 
     <dependencies>
diff --git a/components/camel-test/camel-test-spring/pom.xml b/components/camel-test/camel-test-spring/pom.xml
index a3eab0547f4..1754bccfbb9 100644
--- a/components/camel-test/camel-test-spring/pom.xml
+++ b/components/camel-test/camel-test-spring/pom.xml
@@ -35,7 +35,7 @@
     <properties>
         <firstVersion>2.10.0</firstVersion>
         <label>testing,java,spring</label>
-        <spring-version>${spring5-version}</spring-version>
+        <spring-version>6.0.2</spring-version>
     </properties>
 
     <dependencies>
diff --git a/components/camel-undertow/pom.xml b/components/camel-undertow/pom.xml
index 10044c25c15..d46b1192466 100644
--- a/components/camel-undertow/pom.xml
+++ b/components/camel-undertow/pom.xml
@@ -150,25 +150,25 @@
         <dependency>
             <groupId>org.eclipse.jetty.http2</groupId>
             <artifactId>http2-client</artifactId>
-            <version>${jetty9-version}</version>
+            <version>${jetty-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-client</artifactId>
-            <version>${jetty9-version}</version>
+            <version>${jetty-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty.http2</groupId>
             <artifactId>http2-http-client-transport</artifactId>
-            <version>${jetty9-version}</version>
+            <version>${jetty-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-util</artifactId>
-            <version>${jetty9-version}</version>
+            <version>${jetty-version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/components/camel-websocket/pom.xml b/components/camel-websocket/pom.xml
index fdbb936b88c..335888f2c92 100644
--- a/components/camel-websocket/pom.xml
+++ b/components/camel-websocket/pom.xml
@@ -74,8 +74,8 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
 
         <!-- test dependencies -->
diff --git a/core/camel-core/pom.xml b/core/camel-core/pom.xml
index b3e1c16fb6a..65c9e200310 100644
--- a/core/camel-core/pom.xml
+++ b/core/camel-core/pom.xml
@@ -215,8 +215,8 @@
 
         <!-- Used for the exception tests -->
         <dependency>
-            <groupId>javax.xml.soap</groupId>
-            <artifactId>javax.xml.soap-api</artifactId>
+            <groupId>jakarta.xml.soap</groupId>
+            <artifactId>jakarta.xml.soap-api</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/dsl/camel-jbang/camel-jbang-core/pom.xml b/dsl/camel-jbang/camel-jbang-core/pom.xml
index fb67cf0c883..c3bae105386 100644
--- a/dsl/camel-jbang/camel-jbang-core/pom.xml
+++ b/dsl/camel-jbang/camel-jbang-core/pom.xml
@@ -85,9 +85,9 @@
         </dependency>
         <!-- servlet for launching hawtio -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax-servlet-api-version}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta-servlet-api-version}</version>
             <optional>true</optional>
         </dependency>
 
diff --git a/dsl/camel-xml-jaxb-dsl-test/cdi/pom.xml b/dsl/camel-xml-jaxb-dsl-test/cdi/pom.xml
index 344cf8b99c3..6095bb1b8b2 100644
--- a/dsl/camel-xml-jaxb-dsl-test/cdi/pom.xml
+++ b/dsl/camel-xml-jaxb-dsl-test/cdi/pom.xml
@@ -242,9 +242,9 @@
 
             <dependencies>
                 <dependency>
-                    <groupId>javax.enterprise</groupId>
-                    <artifactId>cdi-api</artifactId>
-                    <version>${cdi-api-2.0-version}</version>
+                    <groupId>jakarta.enterprise</groupId>
+                    <artifactId>jakarta.enterprise.cdi-api</artifactId>
+                    <version>${jakarta-enterprise-cdi-api-version}</version>
                     <scope>provided</scope>
                 </dependency>
 
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
index 9eede64186e..9545f20768e 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
@@ -129,8 +129,8 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 36ac51301c3..94f819a16a1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -96,7 +96,7 @@
         <californium-scandium-version>2.7.4</californium-scandium-version>
         <cassandra-driver-version>4.15.0</cassandra-driver-version>
         <cassandra-version>4.0.6</cassandra-version>
-        <cdi-api-2.0-version>2.0</cdi-api-2.0-version>
+        <jakarta-enterprise-cdi-api-version>4.0.1</jakarta-enterprise-cdi-api-version>
         <jta-api-1.2-version>1.2</jta-api-1.2-version>
         <cglib-version>3.2.12</cglib-version>
         <chunk-templates-version>3.6.2</chunk-templates-version>
@@ -184,12 +184,12 @@
         <geronimo-j2ee-management-spec-version>1.1</geronimo-j2ee-management-spec-version>
         <geronimo-jcdi-1.0-spec-version>1.0</geronimo-jcdi-1.0-spec-version>
         <geronimo-jcdi-1.1-spec-version>1.0</geronimo-jcdi-1.1-spec-version>
-        <geronimo-jms-spec-version>1.1.1</geronimo-jms-spec-version>
-        <geronimo-jms2-spec-version>1.0-alpha-2</geronimo-jms2-spec-version>
-        <geronimo-jpa-spec-version>1.0-alpha-1</geronimo-jpa-spec-version>
+        <jakarta-jms-api-version>3.1.0</jakarta-jms-api-version>
+        <geronimo-jms2-spec-version>${jakarta-jms-api-version}</geronimo-jms2-spec-version>
+        <jakarta-persistence-api-version>3.1.0</jakarta-persistence-api-version>
         <geronimo-json-spec-version>1.5</geronimo-json-spec-version>
         <geronimo-jsonb-spec-version>1.4</geronimo-jsonb-spec-version>
-        <geronimo-jta-spec-version>1.1.1</geronimo-jta-spec-version>
+        <jakarta-transaction-api-version>2.0.1</jakarta-transaction-api-version>
         <geronimo-ws-metadata-spec-version>1.1.3</geronimo-ws-metadata-spec-version>
         <gmavenplus-plugin-version>1.13.1</gmavenplus-plugin-version>
         <google-auth-library-oauth2-http-version>1.7.0</google-auth-library-oauth2-http-version>
@@ -271,18 +271,18 @@
         <javax-el-api-hibernate-validator-version>3.0.1-b04</javax-el-api-hibernate-validator-version>
         <javax-el-hibernate-validator-version>3.0.1-b10</javax-el-hibernate-validator-version>
         <javax-activation-version>1.2.0</javax-activation-version>
-        <javax-annotation-api-version>1.3.2</javax-annotation-api-version>
-        <jakarta-mail-version>1.6.7</jakarta-mail-version>
-        <javax-servlet-api-version>3.1.0</javax-servlet-api-version>
+        <jakarta-annotation-api-version>2.1.1</jakarta-annotation-api-version>
+        <jakarta-mail-version>2.0.1</jakarta-mail-version>
+        <jakarta-servlet-api-version>6.0.0</jakarta-servlet-api-version>
         <jakarta-cdi-api-version>2.0.2</jakarta-cdi-api-version>
         <jakarta-api-version>2.1.5</jakarta-api-version>
         <jakarta.el-version>3.0.3</jakarta.el-version>
-        <jakarta-jaxb-version>2.3.3</jakarta-jaxb-version>
-        <javax-soap-api-version>1.4.0</javax-soap-api-version>
+        <jakarta-jaxb-version>4.0.0</jakarta-jaxb-version>
+        <javax-soap-api-version>3.0.0</javax-soap-api-version>
         <jaxws-api-version>2.3.0</jaxws-api-version>
         <glassfish-javax-json>1.0.4</glassfish-javax-json>
-        <glassfish-jaxb-runtime-version>2.3.6</glassfish-jaxb-runtime-version>
-        <jaxb2-maven-plugin-version>2.5.0</jaxb2-maven-plugin-version>
+        <glassfish-jaxb-runtime-version>4.0.1</glassfish-jaxb-runtime-version>
+        <jaxb2-maven-plugin-version>3.1.0</jaxb2-maven-plugin-version>
         <jbpm-version>7.64.0.Final</jbpm-version>
         <jboss-el-api_3.0_spec-version>2.0.0.Final</jboss-el-api_3.0_spec-version>
         <jboss-logging-version>3.4.3.Final</jboss-logging-version>
@@ -299,8 +299,7 @@
         <jetcd-grpc-version>1.47.0</jetcd-grpc-version>
         <jetcd-guava-version>31.1-jre</jetcd-guava-version>
         <jetcd-version>0.7.3</jetcd-version>
-        <jetty9-version>9.4.49.v20220914</jetty9-version>
-        <jetty-version>${jetty9-version}</jetty-version>
+        <jetty-version>11.0.12</jetty-version>
         <jetty-plugin-version>${jetty-version}</jetty-plugin-version>
         <jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>
         <jettison-version>1.5.2</jettison-version>
@@ -495,8 +494,7 @@
         <spring-integration-version>5.5.15</spring-integration-version>
         <spring-ldap-version>2.4.1</spring-ldap-version>
         <spring-vault-core-version>2.3.2</spring-vault-core-version>
-        <spring-version>${spring5-version}</spring-version>
-        <spring5-version>5.3.24</spring5-version>
+        <spring-version>6.0.2</spring-version>
         <spring-rabbitmq-version>2.4.7</spring-rabbitmq-version>
         <spring-security-version>5.7.5</spring-security-version>
         <spring-ws-version>3.1.4</spring-ws-version>
@@ -516,7 +514,7 @@
         <tika-version>2.6.0</tika-version>
         <twilio-version>7.55.3</twilio-version>
         <twitter4j-version>4.0.7</twitter4j-version>
-        <undertow-version>2.2.19.Final</undertow-version>
+        <undertow-version>2.3.0.Final</undertow-version>
         <univocity-parsers-version>2.9.1</univocity-parsers-version>
         <validation-api-version>2.0.1.Final</validation-api-version>
         <vavr-version>0.10.2</vavr-version>
@@ -3380,29 +3378,24 @@
                 <version>${geronimo-j2ee-management-spec-version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jms_1.1_spec</artifactId>
-                <version>${geronimo-jms-spec-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jms_2.0_spec</artifactId>
-                <version>${geronimo-jms2-spec-version}</version>
+                <groupId>jakarta.jms</groupId>
+                <artifactId>jakarta.jms-api</artifactId>
+                <version>${jakarta-jms-api-version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jpa_2.1_spec</artifactId>
-                <version>${geronimo-jpa-spec-version}</version>
+                <groupId>jakarta.persistence</groupId>
+                <artifactId>jakarta.persistence-api</artifactId>
+                <version>${jakarta-persistence-api-version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jta_1.1_spec</artifactId>
-                <version>${geronimo-jta-spec-version}</version>
+                <groupId>jakarta.transaction</groupId>
+                <artifactId>jakarta.transaction-api</artifactId>
+                <version>${jakarta-transaction-api-version}</version>
             </dependency>
             <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>javax.servlet-api</artifactId>
-                <version>${javax-servlet-api-version}</version>
+                <groupId>jakarta.servlet</groupId>
+                <artifactId>jakarta.servlet-api</artifactId>
+                <version>${jakarta-servlet-api-version}</version>
             </dependency>
             <!-- Optional Spring Support -->
             <dependency>
@@ -4083,9 +4076,9 @@
             </dependency>
 
             <dependency>
-                <groupId>javax.annotation</groupId>
-                <artifactId>javax.annotation-api</artifactId>
-                <version>${javax-annotation-api-version}</version>
+                <groupId>jakarta.annotation</groupId>
+                <artifactId>jakarta.annotation-api</artifactId>
+                <version>${jakarta-annotation-api-version}</version>
             </dependency>
 
             <dependency>
@@ -4124,8 +4117,8 @@
             </dependency>
 
             <dependency>
-                <groupId>javax.xml.soap</groupId>
-                <artifactId>javax.xml.soap-api</artifactId>
+                <groupId>jakarta.xml.soap</groupId>
+                <artifactId>jakarta.xml.soap-api</artifactId>
                 <version>${javax-soap-api-version}</version>
             </dependency>
         </dependencies>
@@ -4160,7 +4153,17 @@
                             <artifactId>jakarta.xml.bind-api</artifactId>
                             <version>${jakarta-jaxb-version}</version>
                         </dependency>
-                    </dependencies>
+                        <dependency>
+                            <groupId>com.sun.xml.bind</groupId>
+                            <artifactId>jaxb-xjc</artifactId>
+                            <version>${jaxb-xjc-version}</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>com.sun.xml.bind</groupId>
+                            <artifactId>jaxb-jxc</artifactId>
+                            <version>${jaxb-jxc-version}</version>
+                        </dependency>
+                   </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index 62e864231f7..e8230bfcb59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,11 +132,12 @@
 
         <!-- eclipse plugin need the jaxb in this pom.xml file -->
         <!-- Make sure to keep JAXB version up to date in parent/pom.xml in the bottom of the file -->
-        <jaxb-api-version>2.3.1</jaxb-api-version>
-        <jaxb-core-version>2.3.0</jaxb-core-version>
-        <jaxb-impl-version>2.3.3</jaxb-impl-version>
-        <jaxb-osgi-version>2.3.3</jaxb-osgi-version>
-        <jaxb-xjc-version>2.3.3</jaxb-xjc-version>
+        <jaxb-api-version>4.0.0</jaxb-api-version>
+        <jaxb-core-version>4.0.1</jaxb-core-version>
+        <jaxb-impl-version>4.0.1</jaxb-impl-version>
+        <jaxb-osgi-version>4.0.1</jaxb-osgi-version>
+        <jaxb-xjc-version>4.0.1</jaxb-xjc-version>
+        <jaxb-jxc-version>4.0.1</jaxb-jxc-version>
         <errorprone-version>2.5</errorprone-version>
         <mycila-license-version>3.0</mycila-license-version>
         <gmavenplus-plugin-version>1.11.1</gmavenplus-plugin-version>
diff --git a/tests/camel-itest-cdi/pom.xml b/tests/camel-itest-cdi/pom.xml
index f58300d000f..aeb30200e08 100644
--- a/tests/camel-itest-cdi/pom.xml
+++ b/tests/camel-itest-cdi/pom.xml
@@ -44,9 +44,9 @@
 
         <!-- CDI API -->
         <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
-            <version>${cdi-api-2.0-version}</version>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <version>${jakarta-enterprise-cdi-api-version}</version>
         </dependency>
 
         <!-- logging -->
diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml
index 68a0dce3a55..9279de1b4df 100644
--- a/tests/camel-itest/pom.xml
+++ b/tests/camel-itest/pom.xml
@@ -282,8 +282,8 @@
         </dependency>
         <!-- need to use jta 1.1.1 with Spring 4.x -->
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jta_1.1_spec</artifactId>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
             <version>1.1.1</version>
             <scope>test</scope>
         </dependency>
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml
index 2fcb1c28047..00c13153cba 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -177,8 +177,8 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/pom.xml
index a1651e0218a..47a4e9e9e21 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/pom.xml
@@ -83,8 +83,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
             <version>1.3.2</version>
             <scope>test</scope>
         </dependency>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto-v3/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto-v3/pom.xml
index 543d4781b04..4acc83cd12c 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto-v3/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto-v3/pom.xml
@@ -55,8 +55,8 @@
       <version>2.8.9</version>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
       <version>1.3.2</version>
     </dependency>
     <dependency>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto/pom.xml
index a8aaf0a1d7c..e15239f438b 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-dto/pom.xml
@@ -55,8 +55,8 @@
       <version>2.8.9</version>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
       <version>1.3.2</version>
     </dependency>
     <dependency>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto-v3/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto-v3/pom.xml
index 38204b8927f..619e865582b 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto-v3/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto-v3/pom.xml
@@ -55,8 +55,8 @@
       <version>2.8.9</version>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
       <version>1.3.2</version>
     </dependency>
     <dependency>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto/pom.xml
index a1bb2cce20b..ce4c6e1ce10 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-xml-dto/pom.xml
@@ -55,8 +55,8 @@
       <version>2.8.9</version>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
       <version>1.3.2</version>
     </dependency>
     <dependency>
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-dto-v3/pom.xml b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-dto-v3/pom.xml
index 2388624adf2..d6a740ef197 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-dto-v3/pom.xml
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/it/simple-yaml-dto-v3/pom.xml
@@ -55,8 +55,8 @@
       <version>2.8.9</version>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
       <version>1.3.2</version>
     </dependency>
     <dependency>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
index 69bc6945327..1fb63c383d8 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
@@ -77,8 +77,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
             <version>1.3.2</version>
             <scope>test</scope>
         </dependency>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-dto/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-dto/pom.xml
index 1c9a64795e1..40125965bd8 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-dto/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-dto/pom.xml
@@ -55,8 +55,8 @@
       <version>2.8.9</version>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
       <version>1.3.2</version>
     </dependency>
   </dependencies>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml-dto/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml-dto/pom.xml
index 3f186129bcf..e0f93f47c92 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml-dto/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/it/simple-xml-dto/pom.xml
@@ -55,8 +55,8 @@
       <version>2.8.9</version>
     </dependency>
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
       <version>1.3.2</version>
     </dependency>
   </dependencies>
diff --git a/tooling/openapi-rest-dsl-generator/pom.xml b/tooling/openapi-rest-dsl-generator/pom.xml
index 819c01fd475..3aae96e3fcf 100644
--- a/tooling/openapi-rest-dsl-generator/pom.xml
+++ b/tooling/openapi-rest-dsl-generator/pom.xml
@@ -71,8 +71,8 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <!-- test -->
diff --git a/tooling/swagger-rest-dsl-generator/pom.xml b/tooling/swagger-rest-dsl-generator/pom.xml
index e49ea06ec7e..a5ac6d50345 100644
--- a/tooling/swagger-rest-dsl-generator/pom.xml
+++ b/tooling/swagger-rest-dsl-generator/pom.xml
@@ -51,8 +51,8 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <!-- test -->