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/12/13 07:22:32 UTC

[camel] branch jakarta/rewritten updated (b84cdac91d9 -> a675d5ffa58)

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 b84cdac91d9 Regen
 discard 3d65da38a13 Fix salesforce component
 discard 094fdadca77 Migration to Jetty 11
 discard 3ff86cbbf20 Switch to jakarta namespace
    omit 152b3acb5ea Rewrite script
     add 7c8e2ef8d72 CAMEL-18802: properties function to support looking up key first before apply function. base64 function needs this.
     add 08c10d09ed5 camel-jbang - camel get count
     add f42fd708d0c Regen for commit 7c8e2ef8d72def4f82bfe04fd6c3d962ce7d02ae (#8868)
     add 030fa614957 (chores) camel-test-infra-kafka: add support for static Kafka containers with authentication
     add 222fcd02f70 (chores) camel-kafka: improve the ability to test for connection state
     add 5fd8af3fe0d (chores) camel-kafka: added invalid auth handling tests
     add 701f09b8a15 [CAMEL-18783]camel-cxf - avoid referring Singleton bean instance(CxfEndpoint) while changing its state in different URIs
     add b41cc7718c1 (chores) camel-test-infra-kafka: ensure proper formatting for the SASL JaaS configuration
     add 31a66d9f6be CAMEL-18796: prevent close exceptions from leaking
     add 1b51d50fef9 CAMEL-18796: added manual test case / verification
     add abe6c59a342 Regen for commit 701f09b8a15eb1c7c92881be86dc02ad640de86c
     add 50c8937a961 (chores) documentation: cleanup the first sections of the getting started
     add 8c877f8d5c8 CAMEL-18797: camel-sql - Only fetch parameter count if really needed. Thanks to John Taylor for the patch.
     add 5c1f9e8214b Upgrade h2 database for testing
     add 10321393eff Fix Flaky Tests Caused by JSON permutations (#8875)
     add d7fe34c5b55 [Hyperledger-Aries] Add support for service=didexchange (#8859)
     add dbad3af30bd CAMEL-18807: camel-yaml-dsl - Using method call in filter EIP not working. This was a general bug in predicates vs expression reifier in camel-core.
     add bb55d5082a2 Fix website build when adding new components for Spring Boot
     add c8025d66910 (chores) documentation: initial cleanup of fundamentals
     add fb8f0ccd914 (chores) documentation: fixes some typos and cleanup redundant terms
     add 964484d00e5 camel-jbang - Add catalog have since column which also can be filtered.
     add a065884e7c3 (chores) doc: fixed broken link
     add 946e16927de (chores) camel-route-parser: replace raw empty list by generic one
     add 0afb5291664 (chores) camel-jira: replace raw empty list by generic one
     add 89568edf252 (chores) camel-kafka: replace raw empty list by generic one
     add 3391380d649 (chores) camel-openapi-java: replace raw empty map by generic one
     add 9b4fba1a816 (chores) camel-sql: replace raw empty list by generic one
     add 905baaad68d (chores) camel-swagger-java: replace raw empty map by generic one
     add e633eff463f (chores) camel-xj: replace raw empty list by generic one
     add c2493072545 (chores) documentation: add a section about creating the project
     add 91b73784025 (chores) replace raw empty collections by generic one (#8880)
     add b4390dcce4c Upgrade AWS SDK v2 to version 2.18.35
     add 8c1b1f7d8ed Sync deps
     add 29b81cfb1e9 Fixed adoc xrefs
     add 13f2df2568e Polished
     add 7455a739fc1 CAMEL-18802: camel-jbang - Automatic download camel-base64 if used as properties function.
     add 7555bb0658d camel-jbang - Upgrade to Kamelets 0.10.0
     add c59a51d932e (chores) documentation: complement documentation about understanding the sample project
     add 7022968603c CAMEL-18802: Endpoints using optional parameters should skip parameter if parameter is using resource loader such as base64.
     add d29fb108e46 camel-kafka: prevent exceptions in close from leaking (CAMEL-18796)
     add dbe7d528c76 [Camel-18808] add support for CamelAzureStorageBlobBlobUploadSize in uploadBlockBlob operation (#8881)
     add a40040d5403 CAMEL-18808: Regen
     add 4aaa0d6c762 CAMEL-18660: Upgrade LocalStack to 1.3.0 that contains kinesis-mock (#8884)
     add 007416de1b2 CAMEL-18748: camel-yaml-dsl - Add missing route-configuration in yaml schema
     add 70e2897f80f CAMEL-18748: camel-yaml-dsl - Add missing route-configuration in yaml schema. Fixed route-configuration to be correct.
     add 178de9c8fc3 Regen
     add e69455a727a CAMEL-18748: camel-yaml-dsl - Add missing route-configuration in yaml schema. Fixed route-configuration to be correct.
     new ef2a60f00a5 Rewrite script
     new 3a81853ed1c Reenable git commands
     new 67ecb1ad247 Switch to jakarta namespace
     new d28f20c2e7f Migration to Jetty 11
     new a675d5ffa58 Fix salesforce component

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   (b84cdac91d9)
            \
             N -- N -- N   refs/heads/jakarta/rewritten (a675d5ffa58)

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 5 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                         |  938 +--
 .../camel/catalog/archetypes/archetype-catalog.xml |   14 +-
 .../org/apache/camel/catalog/components.properties |    3 +
 .../apache/camel/catalog/components/activemq.json  |  249 +
 .../camel/catalog/components/aws-cloudtrail.json   |    2 +-
 .../catalog/components/azure-storage-blob.json     |    1 +
 .../camel/catalog/components/elasticsearch.json    |    2 +-
 .../catalog/components/hyperledger-aries.json      |    2 +-
 .../apache/camel/catalog/components/influxdb2.json |    2 +-
 .../org/apache/camel/catalog/components/jetty.json |    2 +-
 .../catalog/components/kubernetes-events.json      |    2 +-
 .../apache/camel/catalog/components/mapstruct.json |    2 +-
 .../org/apache/camel/catalog/components/plc4x.json |    2 +-
 .../apache/camel/catalog/components/rocketmq.json  |    2 +-
 .../org/apache/camel/catalog/components/stomp.json |   54 +
 .../apache/camel/catalog/components/websocket.json |   73 +
 .../apache/camel/catalog/components/whatsapp.json  |    2 +-
 .../apache/camel/catalog/dataformats.properties    |    1 +
 .../apache/camel/catalog/dataformats/johnzon.json  |   23 +
 .../apache/camel/catalog/dataformats/swiftMt.json  |    2 +-
 .../apache/camel/catalog/dataformats/swiftMx.json  |    2 +-
 .../org/apache/camel/catalog/languages/js.json     |    2 +-
 .../apache/camel/catalog/main/sensitive-keys.json  |    2 +
 .../org/apache/camel/catalog/others.properties     |   10 +
 .../apache/camel/catalog/others/cli-connector.json |    2 +-
 .../apache/camel/catalog/others}/componentdsl.json |    0
 .../apache/camel/catalog/others}/endpointdsl.json  |    0
 .../apache/camel/catalog/others}/groovy-dsl.json   |    0
 .../org/apache/camel/catalog/others}/js-dsl.json   |    0
 .../org/apache/camel/catalog/others}/jsh-dsl.json  |    0
 .../apache/camel/catalog/others}/kamelet-main.json |    0
 .../apache/camel/catalog/others/kotlin-dsl.json    |   15 +
 .../org/apache/camel/catalog/others/test-cdi.json  |   15 +
 .../apache/camel/catalog/others/test-spring.json   |   15 +
 .../org/apache/camel/catalog/others/wal.json       |    2 +-
 .../org/apache/camel/catalog/others}/yaml-dsl.json |    0
 .../apache/camel/catalog/schemas/camel-spring.xsd  | 7482 +++++++++++++-------
 .../org/apache/camel/parser/XmlRestDslParser.java  |    4 +-
 .../activemq/ActiveMQComponentConfigurer.java      |   67 +
 .../activemq/ActiveMQEndpointConfigurer.java       |   58 +
 .../activemq/ActiveMQEndpointUriFactory.java       |  172 +
 .../converter/ActiveMQConverterLoader.java         |   60 +
 .../converter/ActiveMQMessageConverterLoader.java  |   62 +
 .../services/org/apache/camel/TypeConverterLoader  |    3 +
 .../services/org/apache/camel/component.properties |    7 +
 .../services/org/apache/camel/component/activemq   |    2 +
 .../org/apache/camel/configurer/activemq-component |    2 +
 .../org/apache/camel/configurer/activemq-endpoint  |    2 +
 .../org/apache/camel/send-dynamic/activemq         |    2 +
 .../org/apache/camel/urifactory/activemq-endpoint  |    2 +
 .../apache/camel/component/activemq/activemq.json  |  249 +
 .../{adapter-factory => atom-adapter-factory}      |    0
 .../services/org/apache/camel/component.properties |    2 +-
 .../component/{aws-cloudtrail => aws-kinesis}      |    0
 .../component/aws/cloudtrail/aws-cloudtrail.json   |    2 +-
 .../src/main/docs/aws-cloudtrail-component.adoc    |    2 +-
 .../azure/storage/blob/azure-storage-blob.json     |    1 +
 .../azure/storage/blob/BlobConstants.java          |    7 +-
 .../azure/storage/blob/BlobStreamAndLength.java    |    7 +-
 .../storage/blob/client/BlobClientWrapper.java     |   10 +-
 .../storage/blob/integration/BlobOperationsIT.java |   33 +
 .../base64/Base64PropertiesFunction.java           |    8 +
 ...ava => Base64PropertiesFunctionDecodeTest.java} |    4 +-
 ...a => Base64PropertiesFunctionOptionalTest.java} |   10 +-
 .../base64/Base64PropertiesFunctionTest.java       |    8 +-
 .../resources/org/apache/camel/cdi/xml/jaxb.index  |   15 +
 .../camel/component/cxf/CxfEndpointUriFactory.java |  110 +
 .../camel/component/cxf/jaxws/CxfComponent.java    |   31 +-
 .../services/org/apache/camel/component.properties |    7 +
 .../apache/camel/component/es/elasticsearch.json   |    2 +-
 .../src/main/docs/elasticsearch-component.adoc     |    2 +-
 .../component/gson/GsonFieldNamePolicyTest.java    |    6 +-
 .../component/gson/GsonMarshalExclusionTest.java   |   11 +-
 .../gson/SpringGsonFieldNamePolicyTest.java        |    6 +-
 .../camel/http/common/HttpConverterLoader.java     |   12 +-
 .../camel-hyperledger-aries/docker-compose.yml     |   47 +-
 .../ReceiveInvitationFilterConverterLoader.java    |   56 +
 .../services/org/apache/camel/TypeConverterLoader  |    1 +
 .../camel/component/aries/hyperledger-aries.json   |    2 +-
 .../src/main/docs/hyperledger-aries-component.adoc |    2 +-
 .../component/aries/HyperledgerAriesComponent.java |   40 +-
 .../component/aries/HyperledgerAriesProducer.java  |    8 +
 .../aries/handler/AbstractServiceHandler.java      |    5 +
 .../aries/handler/DidExchangeServiceHandler.java   |   79 +
 .../aries/handler/OutOfBandServiceHandler.java     |   62 +
 .../aries/ReceiveInvitationFilterConverter.java    |   36 +-
 .../component/aries/PresentationExchangeTest.java  |    3 +-
 .../influxdb2/InfluxDbComponentConfigurer.java     |   61 +
 .../influxdb2/InfluxDbEndpointConfigurer.java      |   77 +
 .../influxdb2/InfluxDbEndpointUriFactory.java      |   76 +
 .../converters/CamelInfluxDbConvertersLoader.java  |   48 +
 .../camel/component/influxdb2/influxdb2.json       |    2 +-
 .../src/main/docs/influxdb2-component.adoc         |    2 +-
 .../resources/org/apache/camel/language/js/js.json |    2 +-
 .../src/main/docs/js-language.adoc                 |    2 +-
 .../jetty11/JettyHttpComponent11Configurer.java    |    5 -
 .../jetty11/JettyHttpEndpoint11Configurer.java     |    5 -
 .../component/jira/consumer/NewIssuesConsumer.java |    2 +-
 .../johnzon/JohnzonDataFormatConfigurer.java       |   32 +
 .../org/apache/camel/configurer/johnzon-dataformat |    2 +
 .../org/apache/camel/dataformat.properties         |    7 +
 .../services/org/apache/camel/dataformat/johnzon   |    2 +
 .../apache/camel/component/johnzon/johnzon.json    |   23 +
 .../camel/component/kafka/KafkaFetchRecords.java   |   22 +-
 .../camel/component/kafka/KafkaProducer.java       |    2 +-
 .../kafka/SingleNodeKafkaResumeStrategy.java       |    8 +-
 .../integration/AbstractKafkaTestSupport.java      |   13 +-
 .../BaseEmbeddedKafkaAuthTestSupport.java          |   39 +-
 .../kafka/integration/KafkaConsumerAuthIT.java     |   37 +-
 ...AuthIT.java => KafkaConsumerAuthInvalidIT.java} |   79 +-
 .../KafkaConsumerAuthInvalidWithReconnectIT.java   |  184 +
 .../integration/KafkaConsumerAuthManualTest.java   |  129 +
 .../src/test/resources/kafka-jaas-invalid.config   |    8 +
 .../kubernetes/events/kubernetes-events.json       |    2 +-
 .../src/main/docs/kubernetes-events-component.adoc |    2 +-
 .../camel/component/mapstruct/mapstruct.json       |    2 +-
 .../src/main/docs/mapstruct-component.adoc         |    2 +-
 .../apache/camel/openapi/RestOpenApiProcessor.java |    3 +-
 .../org/apache/camel/component/plc4x/plc4x.json    |    2 +-
 .../camel-plc4x/src/main/docs/plc4x-component.adoc |    2 +-
 .../apache/camel/component/rocketmq/rocketmq.json  |    2 +-
 .../src/main/docs/rocketmq-component.adoc          |    4 +-
 .../soap/SoapJaxbDataFormatConfigurer.java         |   24 +
 components/camel-sql/pom.xml                       |    2 +-
 .../apache/camel/component/sql/SqlProducer.java    |   10 +-
 .../component/stomp/StompComponentConfigurer.java  |  113 +
 .../component/stomp/StompEndpointConfigurer.java   |  103 +
 .../component/stomp/StompEndpointUriFactory.java   |   83 +
 .../services/org/apache/camel/component.properties |    7 +
 .../services/org/apache/camel/component/stomp      |    2 +
 .../org/apache/camel/configurer/stomp-component    |    2 +
 .../org/apache/camel/configurer/stomp-endpoint     |    2 +
 .../org/apache/camel/urifactory/stomp-endpoint     |    2 +
 .../org/apache/camel/component/stomp/stomp.json    |   54 +
 .../apache/camel/swagger/RestSwaggerProcessor.java |    3 +-
 .../apache/camel/dataformat/swift/mt/swiftMt.json  |    2 +-
 .../apache/camel/dataformat/swift/mx/swiftMx.json  |    2 +-
 .../src/main/docs/swiftMt-dataformat.adoc          |    2 +-
 .../src/main/docs/swiftMx-dataformat.adoc          |    2 +-
 .../services/org/apache/camel/other.properties     |    7 +
 .../src/generated/resources/test-cdi.json          |   15 +
 .../services/org/apache/camel/other.properties     |    7 +
 .../src/generated/resources/test-spring.json       |   15 +
 .../camel-wal/src/generated/resources/wal.json     |    2 +-
 .../websocket/WebsocketComponentConfigurer.java    |  130 +
 .../websocket/WebsocketEndpointConfigurer.java     |  154 +
 .../websocket/WebsocketEndpointUriFactory.java     |   91 +
 .../services/org/apache/camel/component.properties |    7 +
 .../services/org/apache/camel/component/websocket  |    2 +
 .../apache/camel/configurer/websocket-component    |    2 +
 .../org/apache/camel/configurer/websocket-endpoint |    2 +
 .../org/apache/camel/urifactory/websocket-endpoint |    2 +
 .../camel/component/websocket/websocket.json       |   73 +
 .../apache/camel/component/whatsapp/whatsapp.json  |    2 +-
 .../src/main/docs/whatsapp-component.adoc          |    2 +-
 .../camel/component/xj/XmlJsonStreamWriter.java    |    2 +-
 .../java/org/apache/camel/cloud/ServiceHealth.java |    2 +-
 .../org/apache/camel/spi/PropertiesFunction.java   |   16 +-
 .../camel/impl/engine/AbstractCamelContext.java    |    2 +-
 .../camel/impl/engine/AbstractDynamicRegistry.java |    2 +-
 .../impl/engine/ProvisionalEndpointRegistry.java   |    2 +-
 .../properties/DefaultPropertiesParser.java        |   13 +
 .../component/properties/PropertiesComponent.java  |    3 +-
 .../dsl/DynamicRouterComponentBuilderFactory.java  |  146 +
 .../org/apache/camel/builder/BuilderSupport.java   |    2 +-
 .../java/org/apache/camel/processor/Pipeline.java  |   12 +-
 .../camel/reifier/language/ExpressionReifier.java  |    4 +-
 .../org/apache/camel/core/xml/export.json          |   22 +
 .../MethodCallRefOrBeanPrefixPredicateTest.java    |   37 +-
 .../OptionalPropertyPlaceholderTest.java           |   23 +
 ...tyFunctionOptionalPropertyPlaceholderTest.java} |  144 +-
 .../org/apache/camel/util/ResourceHelperTest.java  |   11 +
 .../dsl/DynamicRouterEndpointBuilderFactory.java   |  554 ++
 .../org/apache/camel/main/components.properties    |    3 +
 .../org/apache/camel/main/dataformats.properties   |    1 +
 .../org/apache/camel/support/EndpointHelper.java   |   15 +-
 .../java/org/apache/camel/util/OgnlHelper.java     |    2 +-
 .../java/org/apache/camel/util/SensitiveUtils.java |    6 +-
 .../java/org/apache/camel/util/URIScanner.java     |    3 +-
 .../modules/ROOT/examples/json/activemq.json       |    1 +
 .../modules/ROOT/examples/json/jetty.json          |    2 +-
 .../modules/ROOT/examples/json/stomp.json          |    1 +
 .../modules/ROOT/examples/json/websocket.json      |    1 +
 .../modules/dataformats/examples/json/johnzon.json |    1 +
 .../modules/others/examples/json/test-cdi.json     |    1 +
 .../modules/others/examples/json/test-spring.json  |    1 +
 docs/main/modules/getting-started/pages/index.adoc |  448 +-
 .../ROOT/pages/camel-3x-upgrade-guide-3_20.adoc    |   18 +
 .../modules/ROOT/pages/route-configuration.adoc    |    6 +-
 .../src/generated/resources/cli-connector.json     |    2 +-
 .../src/main/docs/cli-connector.adoc               |    2 +-
 .../component/ComponentsBuilderFactory.java        |   41 +
 ...y.java => ActivemqComponentBuilderFactory.java} |  584 +-
 .../component/dsl/AmqpComponentBuilderFactory.java |   36 +-
 .../dsl/BeanValidatorComponentBuilderFactory.java  |    6 +-
 .../component/dsl/ImapComponentBuilderFactory.java |   14 +-
 .../dsl/ImapsComponentBuilderFactory.java          |   14 +-
 .../dsl/JettyComponentBuilderFactory.java          |   74 +-
 .../component/dsl/JmsComponentBuilderFactory.java  |   36 +-
 .../component/dsl/JpaComponentBuilderFactory.java  |    3 +-
 .../component/dsl/Pop3ComponentBuilderFactory.java |   14 +-
 .../dsl/Pop3sComponentBuilderFactory.java          |   14 +-
 .../dsl/Sjms2ComponentBuilderFactory.java          |    8 +-
 .../component/dsl/SjmsComponentBuilderFactory.java |    8 +-
 .../component/dsl/SmtpComponentBuilderFactory.java |   14 +-
 .../dsl/SmtpsComponentBuilderFactory.java          |   14 +-
 .../dsl/StompComponentBuilderFactory.java          |  312 +
 .../dsl/WebsocketComponentBuilderFactory.java      |  376 +
 .../src/generated/resources/metadata.json          |   86 +-
 .../builder/endpoint/EndpointBuilderFactory.java   |    5 +-
 .../camel/builder/endpoint/EndpointBuilders.java   |    5 +-
 .../builder/endpoint/StaticEndpointBuilders.java   |  173 +-
 .../endpoint/dsl/AMQPEndpointBuilderFactory.java   |  176 +-
 ...ry.java => ActiveMQEndpointBuilderFactory.java} | 1047 +--
 .../dsl/BeanValidatorEndpointBuilderFactory.java   |   12 +-
 .../endpoint/dsl/BlobEndpointBuilderFactory.java   |   15 +
 ...y.java => JettyHttpEndpointBuilderFactory.java} |  177 +-
 .../endpoint/dsl/JmsEndpointBuilderFactory.java    |  176 +-
 .../endpoint/dsl/MailEndpointBuilderFactory.java   |   40 +-
 .../endpoint/dsl/Sjms2EndpointBuilderFactory.java  |  176 +-
 .../endpoint/dsl/SjmsEndpointBuilderFactory.java   |  176 +-
 .../endpoint/dsl/StompEndpointBuilderFactory.java  |  833 +++
 .../dsl/WebsocketEndpointBuilderFactory.java       | 1496 ++++
 .../dsl/jbang/core/commands/CamelJBangMain.java    |    2 +-
 .../dsl/jbang/core/commands/ExportBaseCommand.java |    2 +-
 .../apache/camel/dsl/jbang/core/commands/Init.java |    2 +-
 .../core/commands/catalog/CatalogBaseCommand.java  |   32 +-
 .../core/commands/catalog/CatalogComponent.java    |    1 +
 .../core/commands/catalog/CatalogDataFormat.java   |    1 +
 .../jbang/core/commands/catalog/CatalogDoc.java    |    2 +-
 .../core/commands/catalog/CatalogKamelet.java      |    2 +-
 .../core/commands/catalog/CatalogLanguage.java     |    1 +
 .../jbang/core/commands/catalog/VersionHelper.java |   59 +
 .../jbang/core/commands/process/CamelCount.java    |   36 +-
 .../camel-jbang-main/dist/CamelJBang.java          |    2 +-
 .../src/main/jbang/main/CamelJBang.java            |    2 +-
 .../camel-component-known-dependencies.properties  |    5 +-
 ...ndencyDownloaderPropertiesFunctionResolver.java |    7 +
 .../download/KnownKameletRoutesBuilderLoader.java  |    2 +-
 .../services/org/apache/camel/other.properties     |    7 +
 .../src/generated/resources/kotlin-dsl.json        |   15 +
 .../dsl/yaml/common/YamlDeserializerSupport.java   |   12 +
 .../RouteConfigurationDefinitionDeserializer.java  |  101 +-
 .../generated/resources/schema/camel-yaml-dsl.json |   90 +-
 .../generated/resources/schema/camelYamlDsl.json   |   87 +-
 .../camel/dsl/yaml/RouteConfigurationTest.groovy   |  100 +-
 jakarta/rewrite.java                               |    5 +-
 parent/pom.xml                                     |    4 +-
 .../test/infra/aws2/services/AWSContainer.java     |    3 +-
 .../services/ContainerLocalAuthKafkaService.java   |   57 +-
 .../packaging/EndpointSchemaGeneratorMojo.java     |    4 +-
 251 files changed, 15317 insertions(+), 5070 deletions(-)
 create mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/activemq.json
 create mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stomp.json
 create mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/websocket.json
 create mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/johnzon.json
 copy {dsl/camel-componentdsl/src/generated/resources => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others}/componentdsl.json (100%)
 copy {dsl/camel-endpointdsl/src/generated/resources => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others}/endpointdsl.json (100%)
 copy {dsl/camel-groovy-dsl/camel-groovy-dsl/src/generated/resources => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others}/groovy-dsl.json (100%)
 copy {dsl/camel-js-dsl/src/generated/resources => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others}/js-dsl.json (100%)
 copy {dsl/camel-jsh-dsl/src/generated/resources => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others}/jsh-dsl.json (100%)
 copy {dsl/camel-kamelet-main/src/generated/resources => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others}/kamelet-main.json (100%)
 create mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kotlin-dsl.json
 create mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-cdi.json
 create mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-spring.json
 copy {dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others}/yaml-dsl.json (100%)
 create mode 100644 components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQComponentConfigurer.java
 create mode 100644 components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointConfigurer.java
 create mode 100644 components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointUriFactory.java
 create mode 100644 components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/converter/ActiveMQConverterLoader.java
 create mode 100644 components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/converter/ActiveMQMessageConverterLoader.java
 create mode 100644 components/camel-activemq/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
 create mode 100644 components/camel-activemq/src/generated/resources/META-INF/services/org/apache/camel/component.properties
 create mode 100644 components/camel-activemq/src/generated/resources/META-INF/services/org/apache/camel/component/activemq
 create mode 100644 components/camel-activemq/src/generated/resources/META-INF/services/org/apache/camel/configurer/activemq-component
 create mode 100644 components/camel-activemq/src/generated/resources/META-INF/services/org/apache/camel/configurer/activemq-endpoint
 create mode 100644 components/camel-activemq/src/generated/resources/META-INF/services/org/apache/camel/send-dynamic/activemq
 create mode 100644 components/camel-activemq/src/generated/resources/META-INF/services/org/apache/camel/urifactory/activemq-endpoint
 create mode 100644 components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json
 copy components/camel-atom/src/generated/resources/META-INF/services/org/apache/camel/{adapter-factory => atom-adapter-factory} (100%)
 copy components/camel-aws/camel-aws-cloudtrail/src/generated/resources/META-INF/services/org/apache/camel/component/{aws-cloudtrail => aws-kinesis} (100%)
 copy components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/{Base64PropertiesFunctionTest.java => Base64PropertiesFunctionDecodeTest.java} (91%)
 copy components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/{Base64PropertiesFunctionTest.java => Base64PropertiesFunctionOptionalTest.java} (85%)
 create mode 100644 components/camel-cdi/src/generated/resources/org/apache/camel/cdi/xml/jaxb.index
 create mode 100644 components/camel-cxf/camel-cxf-soap/src/generated/java/org/apache/camel/component/cxf/CxfEndpointUriFactory.java
 create mode 100644 components/camel-cxf/src/generated/resources/META-INF/services/org/apache/camel/component.properties
 create mode 100644 components/camel-hyperledger-aries/src/generated/java/org/apache/camel/converter/aries/ReceiveInvitationFilterConverterLoader.java
 create mode 100644 components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/DidExchangeServiceHandler.java
 create mode 100644 components/camel-hyperledger-aries/src/main/java/org/apache/camel/component/aries/handler/OutOfBandServiceHandler.java
 copy core/camel-api/src/main/java/org/apache/camel/cloud/ServiceHealth.java => components/camel-hyperledger-aries/src/main/java/org/apache/camel/converter/aries/ReceiveInvitationFilterConverter.java (53%)
 create mode 100644 components/camel-influxdb2/src/generated/java/org/apache/camel/component/influxdb2/InfluxDbComponentConfigurer.java
 create mode 100644 components/camel-influxdb2/src/generated/java/org/apache/camel/component/influxdb2/InfluxDbEndpointConfigurer.java
 create mode 100644 components/camel-influxdb2/src/generated/java/org/apache/camel/component/influxdb2/InfluxDbEndpointUriFactory.java
 create mode 100644 components/camel-influxdb2/src/generated/java/org/apache/camel/component/influxdb2/converters/CamelInfluxDbConvertersLoader.java
 create mode 100644 components/camel-johnzon/src/generated/java/org/apache/camel/component/johnzon/JohnzonDataFormatConfigurer.java
 create mode 100644 components/camel-johnzon/src/generated/resources/META-INF/services/org/apache/camel/configurer/johnzon-dataformat
 create mode 100644 components/camel-johnzon/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties
 create mode 100644 components/camel-johnzon/src/generated/resources/META-INF/services/org/apache/camel/dataformat/johnzon
 create mode 100644 components/camel-johnzon/src/generated/resources/org/apache/camel/component/johnzon/johnzon.json
 copy components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/{KafkaConsumerAuthIT.java => KafkaConsumerAuthInvalidIT.java} (57%)
 create mode 100644 components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthInvalidWithReconnectIT.java
 create mode 100644 components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAuthManualTest.java
 create mode 100644 components/camel-kafka/src/test/resources/kafka-jaas-invalid.config
 create mode 100644 components/camel-soap/src/generated/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormatConfigurer.java
 create mode 100644 components/camel-stomp/src/generated/java/org/apache/camel/component/stomp/StompComponentConfigurer.java
 create mode 100644 components/camel-stomp/src/generated/java/org/apache/camel/component/stomp/StompEndpointConfigurer.java
 create mode 100644 components/camel-stomp/src/generated/java/org/apache/camel/component/stomp/StompEndpointUriFactory.java
 create mode 100644 components/camel-stomp/src/generated/resources/META-INF/services/org/apache/camel/component.properties
 create mode 100644 components/camel-stomp/src/generated/resources/META-INF/services/org/apache/camel/component/stomp
 create mode 100644 components/camel-stomp/src/generated/resources/META-INF/services/org/apache/camel/configurer/stomp-component
 create mode 100644 components/camel-stomp/src/generated/resources/META-INF/services/org/apache/camel/configurer/stomp-endpoint
 create mode 100644 components/camel-stomp/src/generated/resources/META-INF/services/org/apache/camel/urifactory/stomp-endpoint
 create mode 100644 components/camel-stomp/src/generated/resources/org/apache/camel/component/stomp/stomp.json
 create mode 100644 components/camel-test/camel-test-cdi/src/generated/resources/META-INF/services/org/apache/camel/other.properties
 create mode 100644 components/camel-test/camel-test-cdi/src/generated/resources/test-cdi.json
 create mode 100644 components/camel-test/camel-test-spring/src/generated/resources/META-INF/services/org/apache/camel/other.properties
 create mode 100644 components/camel-test/camel-test-spring/src/generated/resources/test-spring.json
 create mode 100644 components/camel-websocket/src/generated/java/org/apache/camel/component/websocket/WebsocketComponentConfigurer.java
 create mode 100644 components/camel-websocket/src/generated/java/org/apache/camel/component/websocket/WebsocketEndpointConfigurer.java
 create mode 100644 components/camel-websocket/src/generated/java/org/apache/camel/component/websocket/WebsocketEndpointUriFactory.java
 create mode 100644 components/camel-websocket/src/generated/resources/META-INF/services/org/apache/camel/component.properties
 create mode 100644 components/camel-websocket/src/generated/resources/META-INF/services/org/apache/camel/component/websocket
 create mode 100644 components/camel-websocket/src/generated/resources/META-INF/services/org/apache/camel/configurer/websocket-component
 create mode 100644 components/camel-websocket/src/generated/resources/META-INF/services/org/apache/camel/configurer/websocket-endpoint
 create mode 100644 components/camel-websocket/src/generated/resources/META-INF/services/org/apache/camel/urifactory/websocket-endpoint
 create mode 100644 components/camel-websocket/src/generated/resources/org/apache/camel/component/websocket/websocket.json
 create mode 100644 core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DynamicRouterComponentBuilderFactory.java
 create mode 100644 core/camel-core-xml/src/generated/resources/org/apache/camel/core/xml/export.json
 copy components/camel-base64/src/test/java/org/apache/camel/dataformat/base64/Base64PropertiesFunctionTest.java => core/camel-core/src/test/java/org/apache/camel/component/bean/MethodCallRefOrBeanPrefixPredicateTest.java (50%)
 copy core/camel-core/src/test/java/org/apache/camel/component/properties/{OptionalPropertyPlaceholderTest.java => PropertyFunctionOptionalPropertyPlaceholderTest.java} (59%)
 create mode 100644 core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DynamicRouterEndpointBuilderFactory.java
 create mode 120000 docs/components/modules/ROOT/examples/json/activemq.json
 create mode 120000 docs/components/modules/ROOT/examples/json/stomp.json
 create mode 120000 docs/components/modules/ROOT/examples/json/websocket.json
 create mode 120000 docs/components/modules/dataformats/examples/json/johnzon.json
 create mode 120000 docs/components/modules/others/examples/json/test-cdi.json
 create mode 120000 docs/components/modules/others/examples/json/test-spring.json
 copy dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/{AmqpComponentBuilderFactory.java => ActivemqComponentBuilderFactory.java} (77%)
 create mode 100644 dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StompComponentBuilderFactory.java
 create mode 100644 dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WebsocketComponentBuilderFactory.java
 copy dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/{AMQPEndpointBuilderFactory.java => ActiveMQEndpointBuilderFactory.java} (87%)
 rename dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/{JettyHttp11EndpointBuilderFactory.java => JettyHttpEndpointBuilderFactory.java} (88%)
 create mode 100644 dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/StompEndpointBuilderFactory.java
 create mode 100644 dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/WebsocketEndpointBuilderFactory.java
 create mode 100644 dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/VersionHelper.java
 create mode 100644 dsl/camel-kotlin-dsl/src/generated/resources/META-INF/services/org/apache/camel/other.properties
 create mode 100644 dsl/camel-kotlin-dsl/src/generated/resources/kotlin-dsl.json


[camel] 05/05: Fix salesforce component

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 a675d5ffa58e55add9ecebc09a7393f321d573c9
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Dec 7 11:46:38 2022 +0100

    Fix salesforce component
    
    (cherry picked from commit eda15c498fb3834996924607e353ecb1e37cffcc)
---
 .../salesforce/codegen/AbstractSalesforceExecution.java |  2 +-
 .../camel-salesforce/camel-salesforce-component/pom.xml | 12 +-----------
 .../camel/component/salesforce/SalesforceComponent.java |  6 +++---
 .../camel/component/salesforce/SalesforceConsumer.java  |  6 ++++--
 .../component/salesforce/SalesforceHttpClient.java      | 13 ++++++++++---
 .../salesforce/internal/client/AbstractClientBase.java  |  9 +++++----
 .../internal/client/DefaultAnalyticsApiClient.java      |  2 +-
 .../internal/client/DefaultBulkApiClient.java           |  2 +-
 .../internal/client/DefaultBulkApiV2Client.java         |  2 +-
 .../internal/client/DefaultCompositeApiClient.java      |  2 +-
 .../DefaultCompositeSObjectCollectionsApiClient.java    |  2 +-
 .../salesforce/internal/client/DefaultRawClient.java    |  4 ++--
 .../salesforce/internal/client/DefaultRestClient.java   |  2 +-
 .../internal/client/SalesforceSecurityHandler.java      | 17 +++++++++--------
 .../salesforce/internal/streaming/ReplayExtension.java  |  4 ++--
 .../internal/streaming/SubscriptionHelper.java          | 13 +++++--------
 .../component/salesforce/BulkApiIntegrationTest.java    | 10 ++++++++--
 .../component/salesforce/HttpProxyIntegrationTest.java  | 10 ++++------
 .../component/salesforce/RestApiIntegrationTest.java    | 17 +++++++++++++----
 .../component/salesforce/SalesforceConsumerTest.java    |  6 ++++--
 .../salesforce/internal/SessionIntegrationTest.java     |  2 +-
 .../internal/client/AbstractClientBaseTest.java         |  4 ++--
 22 files changed, 80 insertions(+), 67 deletions(-)

diff --git a/components/camel-salesforce/camel-salesforce-codegen/src/main/java/org/apache/camel/component/salesforce/codegen/AbstractSalesforceExecution.java b/components/camel-salesforce/camel-salesforce-codegen/src/main/java/org/apache/camel/component/salesforce/codegen/AbstractSalesforceExecution.java
index db6eeb356a3..a7cf151ebb3 100644
--- a/components/camel-salesforce/camel-salesforce-codegen/src/main/java/org/apache/camel/component/salesforce/codegen/AbstractSalesforceExecution.java
+++ b/components/camel-salesforce/camel-salesforce-codegen/src/main/java/org/apache/camel/component/salesforce/codegen/AbstractSalesforceExecution.java
@@ -203,7 +203,7 @@ public abstract class AbstractSalesforceExecution {
 
         // set ssl context parameters
         try {
-            final SslContextFactory sslContextFactory = new SslContextFactory();
+            final SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
             sslContextFactory.setSslContext(sslContextParameters.createSSLContext(camelContext));
 
             SecurityUtils.adaptToIBMCipherNames(sslContextFactory);
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml
index ba5cd7ed55c..fd92b08a72f 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -108,18 +108,8 @@
         </dependency>
         <dependency>
             <groupId>org.cometd.java</groupId>
-            <artifactId>cometd-java-client-websocket-jetty</artifactId>
+            <artifactId>cometd-java-client-http-jetty</artifactId>
             <version>${cometd-java-client-version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
index 6fac729d865..8659ba42e1a 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
@@ -391,7 +391,7 @@ public class SalesforceComponent extends DefaultComponent implements SSLContextP
                         .orElseGet(() -> Optional.ofNullable(retrieveGlobalSslContextParameters())
                                 .orElseGet(() -> new SSLContextParameters()));
 
-                final SslContextFactory sslContextFactory = new SslContextFactory();
+                final SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
                 sslContextFactory.setSslContext(contextParameters.createSSLContext(getCamelContext()));
 
                 httpClient = createHttpClient(this, sslContextFactory, getCamelContext(), workerPoolSize, workerPoolMaxSize);
@@ -820,7 +820,7 @@ public class SalesforceComponent extends DefaultComponent implements SSLContextP
         // let's work with a copy so original properties are intact
         PropertyBindingSupport.bindProperties(camelContext, sslContextParameters, new HashMap<>(properties));
 
-        final SslContextFactory sslContextFactory = new SslContextFactory();
+        final SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
         sslContextFactory.setSslContext(sslContextParameters.createSSLContext(camelContext));
 
         final SalesforceHttpClient httpClient
@@ -838,7 +838,7 @@ public class SalesforceComponent extends DefaultComponent implements SSLContextP
     }
 
     static SalesforceHttpClient createHttpClient(
-            Object source, final SslContextFactory sslContextFactory, final CamelContext context, int workerPoolSize,
+            Object source, final SslContextFactory.Client sslContextFactory, final CamelContext context, int workerPoolSize,
             int workerPoolMaxSize) {
         SecurityUtils.adaptToIBMCipherNames(sslContextFactory);
 
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
index bda83acabb9..71ce21726e0 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
@@ -170,7 +170,8 @@ public class SalesforceConsumer extends DefaultConsumer {
 
         if (rawPayload) {
             // getJSON is used for raw payload
-            in.setBody(message.getJSON());
+            in.setBody(new org.cometd.common.JacksonJSONContextClient()
+                            .generate(new org.cometd.common.HashMapMessage(message)));
         } else {
             payload.remove("ChangeEventHeader");
             in.setBody(payload);
@@ -200,7 +201,8 @@ public class SalesforceConsumer extends DefaultConsumer {
 
         if (rawPayload) {
             // getJSON is used for raw payload
-            in.setBody(message.getJSON());
+            in.setBody(new org.cometd.common.JacksonJSONContextClient()
+                    .generate(new org.cometd.common.HashMapMessage(message)));
         } else {
             in.setBody(platformEvent);
         }
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceHttpClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceHttpClient.java
index e12403c498a..67aceb4c9a6 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceHttpClient.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceHttpClient.java
@@ -33,6 +33,7 @@ import org.eclipse.jetty.client.HttpRequest;
 import org.eclipse.jetty.client.ProtocolHandler;
 import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP;
+import org.eclipse.jetty.io.ClientConnector;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 
 /**
@@ -61,12 +62,12 @@ public class SalesforceHttpClient extends HttpClient {
         this(null);
     }
 
-    public SalesforceHttpClient(SslContextFactory sslContextFactory) {
+    public SalesforceHttpClient(SslContextFactory.Client sslContextFactory) {
         this(null, Executors.newCachedThreadPool(), sslContextFactory);
     }
 
-    public SalesforceHttpClient(CamelContext context, ExecutorService workerPool, SslContextFactory sslContextFactory) {
-        super(new HttpClientTransportOverHTTP(), sslContextFactory);
+    public SalesforceHttpClient(CamelContext context, ExecutorService workerPool, SslContextFactory.Client sslContextFactory) {
+        super(new HttpClientTransportOverHTTP(newConnector(sslContextFactory)));
         this.workerPool = workerPool;
         this.camelContext = context;
 
@@ -90,6 +91,12 @@ public class SalesforceHttpClient extends HttpClient {
         }
     }
 
+    private static ClientConnector newConnector(SslContextFactory.Client sslContextFactory) {
+        ClientConnector connector = new ClientConnector();
+        connector.setSslContextFactory(sslContextFactory);
+        return connector;
+    }
+
     @Override
     public HttpRequest newHttpRequest(HttpConversation conversation, URI uri) {
         final SalesforceHttpRequest request = new SalesforceHttpRequest(this, conversation, uri);
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/AbstractClientBase.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/AbstractClientBase.java
index cdbc0462509..984cb05a001 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/AbstractClientBase.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/AbstractClientBase.java
@@ -368,10 +368,11 @@ public abstract class AbstractClientBase extends ServiceSupport
             return;
         }
 
-        final HttpFields requestHeaders = request.getHeaders();
-        for (Entry<String, List<String>> header : headers.entrySet()) {
-            requestHeaders.put(header.getKey(), header.getValue());
-        }
+        request.headers(requestHeaders -> {
+            for (Entry<String, List<String>> header : headers.entrySet()) {
+                requestHeaders.put(header.getKey(), header.getValue());
+            }
+        });
     }
 
     static Map<String, List<String>> determineHeaders(final Exchange exchange) {
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java
index fa9725fddf4..eee09ac6fdd 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultAnalyticsApiClient.java
@@ -250,7 +250,7 @@ public class DefaultAnalyticsApiClient extends AbstractClientBase implements Ana
     @Override
     protected void setAccessToken(Request request) {
         // replace old token
-        request.getHeaders().put(HttpHeader.AUTHORIZATION, TOKEN_PREFIX + accessToken);
+        request.header(HttpHeader.AUTHORIZATION, TOKEN_PREFIX + accessToken);
     }
 
     @Override
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiClient.java
index b8991d00437..d2d86630098 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiClient.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiClient.java
@@ -366,7 +366,7 @@ public class DefaultBulkApiClient extends AbstractClientBase implements BulkApiC
     @Override
     protected void setAccessToken(Request request) {
         // replace old token
-        request.getHeaders().put(TOKEN_HEADER, accessToken);
+        request.header(TOKEN_HEADER, accessToken);
     }
 
     @Override
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiV2Client.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiV2Client.java
index 38f11b3274d..8b4ff1554c3 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiV2Client.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiV2Client.java
@@ -312,7 +312,7 @@ public class DefaultBulkApiV2Client extends AbstractClientBase implements BulkAp
 
     @Override
     protected void setAccessToken(Request request) {
-        request.getHeaders().put(AUTHORIZATION_HEADER, BEARER_PREFIX + accessToken);
+        request.header(AUTHORIZATION_HEADER, BEARER_PREFIX + accessToken);
     }
 
     private String jobUrl(String jobId) {
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeApiClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeApiClient.java
index 9b05fa62240..79567c25471 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeApiClient.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeApiClient.java
@@ -228,7 +228,7 @@ public class DefaultCompositeApiClient extends AbstractClientBase implements Com
 
     @Override
     protected void setAccessToken(final Request request) {
-        request.getHeaders().put("Authorization", "Bearer " + accessToken);
+        request.header("Authorization", "Bearer " + accessToken);
     }
 
     static void checkCompositeBatchVersion(final String configuredVersion, final Version batchVersion)
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeSObjectCollectionsApiClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeSObjectCollectionsApiClient.java
index 734ae54b4de..ff9d6956d1a 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeSObjectCollectionsApiClient.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeSObjectCollectionsApiClient.java
@@ -182,7 +182,7 @@ public class DefaultCompositeSObjectCollectionsApiClient extends AbstractClientB
 
     @Override
     protected void setAccessToken(final Request request) {
-        request.getHeaders().put("Authorization", "Bearer " + accessToken);
+        request.header("Authorization", "Bearer " + accessToken);
     }
 
     private Request createRequest(final String method, final String url, final Map<String, List<String>> headers) {
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRawClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRawClient.java
index c4483d4e0af..a004081d6e8 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRawClient.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRawClient.java
@@ -49,8 +49,8 @@ public class DefaultRawClient extends AbstractClientBase implements RawClient {
     @Override
     protected void setAccessToken(Request request) {
         // replace old token
-        request.getHeaders().put(BULK_TOKEN_HEADER, accessToken);
-        request.getHeaders().put(REST_TOKEN_HEADER, TOKEN_PREFIX + accessToken);
+        request.header(BULK_TOKEN_HEADER, accessToken);
+        request.header(REST_TOKEN_HEADER, TOKEN_PREFIX + accessToken);
     }
 
     @Override
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
index fc1329186bf..dd986926bed 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultRestClient.java
@@ -406,7 +406,7 @@ public class DefaultRestClient extends AbstractClientBase implements RestClient
     @Override
     protected void setAccessToken(Request request) {
         // replace old token
-        request.getHeaders().put(TOKEN_HEADER, TOKEN_PREFIX + accessToken);
+        request.header(TOKEN_HEADER, TOKEN_PREFIX + accessToken);
     }
 
     private String urlEncode(String query) throws UnsupportedEncodingException {
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityHandler.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityHandler.java
index b672f5c101f..fd5f3380327 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityHandler.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityHandler.java
@@ -253,15 +253,16 @@ public class SalesforceSecurityHandler implements ProtocolHandler {
             if (copy) {
                 newRequest = httpClient.copyRequest(request, request.getURI());
                 newRequest.method(request.getMethod());
-                HttpFields headers = newRequest.getHeaders();
-                // copy cookies and host for subscriptions to avoid
-                // '403::Unknown Client' errors
-                for (HttpField field : request.getHeaders()) {
-                    HttpHeader header = field.getHeader();
-                    if (HttpHeader.COOKIE.equals(header) || HttpHeader.HOST.equals(header)) {
-                        headers.add(header, field.getValue());
+                newRequest.headers(headers -> {
+                    // copy cookies and host for subscriptions to avoid
+                    // '403::Unknown Client' errors
+                    for (HttpField field : request.getHeaders()) {
+                        HttpHeader header = field.getHeader();
+                        if (HttpHeader.COOKIE.equals(header) || HttpHeader.HOST.equals(header)) {
+                            headers.add(header, field.getValue());
+                        }
                     }
-                }
+                });
             } else {
                 newRequest = request;
             }
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/ReplayExtension.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/ReplayExtension.java
index b70dc995ed2..287d4400da5 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/ReplayExtension.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/ReplayExtension.java
@@ -32,7 +32,7 @@ import java.util.function.Supplier;
 import org.cometd.bayeux.Channel;
 import org.cometd.bayeux.Message;
 import org.cometd.bayeux.client.ClientSession;
-import org.cometd.bayeux.client.ClientSession.Extension.Adapter;
+import org.cometd.bayeux.client.ClientSession.Extension;
 
 /**
  * The Bayeux extension for replay
@@ -40,7 +40,7 @@ import org.cometd.bayeux.client.ClientSession.Extension.Adapter;
  * @author hal.hildebrand
  * @since  API v37.0
  */
-public class ReplayExtension extends Adapter {
+public class ReplayExtension implements Extension {
     private static final String EXTENSION_NAME = "replay";
     private static final String EVENT_KEY = "event";
     private static final String REPLAY_ID_KEY = "replayId";
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
index 51441670ef5..e0cb14a385f 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
@@ -16,10 +16,7 @@
  */
 package org.apache.camel.component.salesforce.internal.streaming;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
@@ -39,8 +36,8 @@ import org.cometd.bayeux.client.ClientSessionChannel;
 import org.cometd.bayeux.client.ClientSessionChannel.MessageListener;
 import org.cometd.client.BayeuxClient;
 import org.cometd.client.BayeuxClient.State;
+import org.cometd.client.http.jetty.JettyHttpClientTransport;
 import org.cometd.client.transport.ClientTransport;
-import org.cometd.client.transport.LongPollingTransport;
 import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.http.HttpHeader;
 import org.slf4j.Logger;
@@ -297,7 +294,7 @@ public class SubscriptionHelper extends ServiceSupport {
                 if (client != null && client.isHandshook()) {
                     LOG.debug("Successful handshake!");
                     // reset backoff interval
-                    handshakeBackoff.set(client.getBackoffIncrement());
+                    handshakeBackoff.set(backoffIncrement);
                 } else {
                     LOG.error("Failed to handshake after pausing for {} msecs", backoff);
                     if ((backoff + backoffIncrement) > maxBackoff) {
@@ -387,7 +384,7 @@ public class SubscriptionHelper extends ServiceSupport {
             session.login(null);
         }
 
-        LongPollingTransport transport = new LongPollingTransport(options, httpClient) {
+        ClientTransport transport = new JettyHttpClientTransport(options, httpClient) {
             @Override
             protected void customize(Request request) {
                 super.customize(request);
@@ -401,7 +398,7 @@ public class SubscriptionHelper extends ServiceSupport {
                         throw new RuntimeException(e);
                     }
                 }
-                request.getHeaders().put(HttpHeader.AUTHORIZATION, "OAuth " + accessToken);
+                request.header(HttpHeader.AUTHORIZATION, "OAuth " + accessToken);
             }
         };
 
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiIntegrationTest.java
index 3e4fb04a798..fc9b405cab8 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiIntegrationTest.java
@@ -24,10 +24,13 @@ import org.apache.camel.component.salesforce.api.dto.bulk.OperationEnum;
 import org.apache.camel.component.salesforce.dto.generated.Merchandise__c;
 import org.apache.camel.support.jsse.SSLContextParameters;
 import org.eclipse.jetty.client.HttpClient;
+import org.eclipse.jetty.client.HttpClientTransport;
 import org.eclipse.jetty.client.api.ContentResponse;
 import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP;
 import org.eclipse.jetty.http.HttpMethod;
 import org.eclipse.jetty.http.HttpStatus;
+import org.eclipse.jetty.io.ClientConnector;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
@@ -42,9 +45,12 @@ public class BulkApiIntegrationTest extends AbstractBulkApiTestBase {
         final SalesforceComponent sf = context().getComponent("salesforce", SalesforceComponent.class);
         final String accessToken = sf.getSession().getAccessToken();
 
-        final SslContextFactory sslContextFactory = new SslContextFactory.Client();
+        final SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
         sslContextFactory.setSslContext(new SSLContextParameters().createSSLContext(context));
-        final HttpClient httpClient = new HttpClient(sslContextFactory);
+        final ClientConnector connector = new ClientConnector();
+        connector.setSslContextFactory(sslContextFactory);
+        final HttpClientTransport transport = new HttpClientTransportOverHTTP(connector);
+        final HttpClient httpClient = new HttpClient(transport);
         httpClient.setConnectTimeout(60000);
         httpClient.start();
 
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java
index f676ef2fa03..5640deb4815 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java
@@ -16,10 +16,8 @@
  */
 package org.apache.camel.component.salesforce;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 
@@ -36,7 +34,6 @@ import org.apache.camel.test.junit5.params.Test;
 import org.eclipse.jetty.proxy.ConnectHandler;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.util.B64Code;
 import org.eclipse.jetty.util.StringUtil;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -108,7 +105,8 @@ public class HttpProxyIntegrationTest extends AbstractSalesforceTestBase {
         server.addConnector(connector);
 
         final String authenticationString
-                = "Basic " + B64Code.encode(HTTP_PROXY_USER_NAME + ":" + HTTP_PROXY_PASSWORD, StringUtil.__ISO_8859_1);
+                = "Basic " + Base64.getEncoder().encodeToString(
+                        (HTTP_PROXY_USER_NAME + ":" + HTTP_PROXY_PASSWORD).getBytes(StandardCharsets.ISO_8859_1));
 
         ConnectHandler connectHandler = new ConnectHandler() {
             @Override
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
index 0966e5ee092..cc5ec0f4bf4 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/RestApiIntegrationTest.java
@@ -59,10 +59,13 @@ import org.apache.camel.support.DefaultExchange;
 import org.apache.camel.support.jsse.SSLContextParameters;
 import org.apache.commons.io.IOUtils;
 import org.eclipse.jetty.client.HttpClient;
+import org.eclipse.jetty.client.HttpClientTransport;
 import org.eclipse.jetty.client.api.ContentResponse;
 import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP;
 import org.eclipse.jetty.http.HttpMethod;
 import org.eclipse.jetty.http.HttpStatus;
+import org.eclipse.jetty.io.ClientConnector;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -619,9 +622,12 @@ public class RestApiIntegrationTest extends AbstractSalesforceTestBase {
         final SalesforceComponent sf = context().getComponent("salesforce", SalesforceComponent.class);
         final String accessToken = sf.getSession().getAccessToken();
 
-        final SslContextFactory sslContextFactory = new SslContextFactory.Client();
+        final SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
         sslContextFactory.setSslContext(new SSLContextParameters().createSSLContext(context));
-        final HttpClient httpClient = new HttpClient(sslContextFactory);
+        final ClientConnector connector = new ClientConnector();
+        connector.setSslContextFactory(sslContextFactory);
+        final HttpClientTransport transport = new HttpClientTransportOverHTTP(connector);
+        final HttpClient httpClient = new HttpClient(transport);
         httpClient.setConnectTimeout(60000);
         httpClient.start();
 
@@ -639,9 +645,12 @@ public class RestApiIntegrationTest extends AbstractSalesforceTestBase {
         final SalesforceComponent sf = context().getComponent("salesforce", SalesforceComponent.class);
         final String accessToken = sf.getSession().getAccessToken();
 
-        final SslContextFactory sslContextFactory = new SslContextFactory.Client();
+        final SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
         sslContextFactory.setSslContext(new SSLContextParameters().createSSLContext(context));
-        final HttpClient httpClient = new HttpClient(sslContextFactory);
+        final ClientConnector connector = new ClientConnector();
+        connector.setSslContextFactory(sslContextFactory);
+        final HttpClientTransport transport = new HttpClientTransportOverHTTP(connector);
+        final HttpClient httpClient = new HttpClient(transport);
         httpClient.setConnectTimeout(60000);
         httpClient.start();
 
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceConsumerTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceConsumerTest.java
index c411d907eb0..0244a912421 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceConsumerTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/SalesforceConsumerTest.java
@@ -273,7 +273,8 @@ public class SalesforceConsumerTest {
 
         consumer.processMessage(mock(ClientSessionChannel.class), message);
 
-        verify(in).setBody(message.getJSON());
+        verify(in).setBody(new org.cometd.common.JacksonJSONContextClient()
+                .generate(new org.cometd.common.HashMapMessage(message)));
         verify(in).setHeader("CamelSalesforceCreatedDate", ZonedDateTime.parse("2018-07-06T12:41:04Z"));
         verify(in).setHeader("CamelSalesforceReplayId", 4L);
         verify(in).setHeader("CamelSalesforceChannel", "/event/TestEvent__e");
@@ -337,7 +338,8 @@ public class SalesforceConsumerTest {
 
         consumer.processMessage(mock(ClientSessionChannel.class), mockChangeEvent);
 
-        verify(in).setBody(mockChangeEvent.getJSON());
+        verify(in).setBody(new org.cometd.common.JacksonJSONContextClient()
+                .generate(new org.cometd.common.HashMapMessage(mockChangeEvent)));
     }
 
     static Message createPushTopicMessage() {
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SessionIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SessionIntegrationTest.java
index 3566d639a77..900f2a8cf37 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SessionIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SessionIntegrationTest.java
@@ -40,7 +40,7 @@ public class SessionIntegrationTest implements SalesforceSession.SalesforceSessi
     @Test
     public void testLogin() throws Exception {
 
-        final SslContextFactory sslContextFactory = new SslContextFactory.Client();
+        final SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
         sslContextFactory.setSslContext(new SSLContextParameters().createSSLContext(new DefaultCamelContext()));
         final SalesforceHttpClient httpClient = new SalesforceHttpClient(sslContextFactory);
         httpClient.setConnectTimeout(TIMEOUT);
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/client/AbstractClientBaseTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/client/AbstractClientBaseTest.java
index af35dfe3ff7..9b430ed7c45 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/client/AbstractClientBaseTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/client/AbstractClientBaseTest.java
@@ -113,7 +113,7 @@ public class AbstractClientBaseTest {
     @Test
     public void shouldDetermineHeadersFromResponse() {
         final Response response = mock(Response.class);
-        final HttpFields httpHeaders = new HttpFields();
+        final HttpFields.Mutable httpHeaders = HttpFields.build();
         httpHeaders.add("Date", "Mon, 20 May 2013 22:21:46 GMT");
         httpHeaders.add("Sforce-Limit-Info", "api-usage=18/5000");
         httpHeaders.add("Last-Modified", "Mon, 20 May 2013 20:49:32 GMT");
@@ -139,7 +139,7 @@ public class AbstractClientBaseTest {
         final Result result = mock(Result.class);
         final Response response = mock(Response.class);
         when(result.getResponse()).thenReturn(response);
-        when(response.getHeaders()).thenReturn(new HttpFields());
+        when(response.getHeaders()).thenReturn(HttpFields.build());
 
         final SalesforceHttpRequest salesforceRequest = mock(SalesforceHttpRequest.class);
         when(result.getRequest()).thenReturn(salesforceRequest);


[camel] 04/05: 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 d28f20c2e7fe23c7c0715a8fdb011aafaa70c0f3
Author: Vladimir V. Bychkov <gi...@bychkov.name>
AuthorDate: Mon Nov 14 09:56:27 2022 +0100

    Migration to Jetty 11
    
    (cherry picked from commit 5e57bb6cc86bfdbc474f91fc2c152cb0fc03a9ff)
---
 .../org/apache/camel/catalog/components/jetty.json |  4 +-
 .../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 |  4 +-
 .../{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 +-
 .../component/websocket/WebsocketComponent.java    |  2 +-
 .../component/ComponentsBuilderFactory.java        |  2 +-
 .../dsl/JettyComponentBuilderFactory.java          |  6 +-
 .../src/generated/resources/metadata.json          |  2 +-
 .../builder/endpoint/StaticEndpointBuilders.java   |  4 +-
 .../dsl/JettyHttpEndpointBuilderFactory.java       |  8 +--
 .../infra/jetty/services/JettyEmbeddedService.java |  2 +-
 37 files changed, 130 insertions(+), 121 deletions(-)

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 932d1f3b777..5003ce42d7a 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
@@ -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.JettyHttpComponent9",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jetty",
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..e9314ae4a46 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 11 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 932d1f3b777..a6c2e50f019 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..f9bebc9f477 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
@@ -496,7 +496,7 @@ from("jetty:http://0.0.0.0:9080/myservice?handlers=securityHandler")
 If you need more handlers, set the `handlers` option equal to a
 comma-separated list of bean IDs.
 
-Blueprint based definition of basic authentication (based on Jetty 9):
+Blueprint based definition of basic authentication (based on Jetty 11):
 
 [source,xml]
 ----
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..f7de2a08099 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 11.
  */
 @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/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
index 16b874a32f8..ae7c5772962 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
@@ -470,7 +470,7 @@ public class WebsocketComponent extends DefaultComponent implements SSLContextPa
         servlets.put(pathSpec, servlet);
         ServletHolder servletHolder = new ServletHolder(servlet);
         servletHolder.getInitParameters().putAll(handler.getInitParams());
-        // Jetty 9 parameter bufferSize is now inputBufferSize
+        // Jetty 11 parameter bufferSize is now inputBufferSize
         servletHolder.setInitParameter("inputBufferSize", handler.getInitParameter("bufferSize"));
         handler.addServlet(servletHolder, pathSpec);
         return servlet;
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 a6ce9cb7486..ab43a70c3fe 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
@@ -2360,7 +2360,7 @@ public interface ComponentsBuilderFactory {
     }
     /**
      * Jetty (camel-jetty)
-     * Expose HTTP endpoints using Jetty 9.
+     * Expose HTTP endpoints using Jetty 11.
      * 
      * Category: http
      * Since: 1.2
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 41ef2d79a1c..f124a1e96bd 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
@@ -20,10 +20,10 @@ import javax.annotation.processing.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
-import org.apache.camel.component.jetty9.JettyHttpComponent9;
+import org.apache.camel.component.jetty11.JettyHttpComponent11;
 
 /**
- * Expose HTTP endpoints using Jetty 9.
+ * Expose HTTP endpoints using Jetty 11.
  * 
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
@@ -32,7 +32,7 @@ public interface JettyComponentBuilderFactory {
 
     /**
      * Jetty (camel-jetty)
-     * Expose HTTP endpoints using Jetty 9.
+     * Expose HTTP endpoints using Jetty 11.
      * 
      * Category: http
      * Since: 1.2
diff --git a/dsl/camel-componentdsl/src/generated/resources/metadata.json b/dsl/camel-componentdsl/src/generated/resources/metadata.json
index da8fe81bb01..69c92b818ac 100644
--- a/dsl/camel-componentdsl/src/generated/resources/metadata.json
+++ b/dsl/camel-componentdsl/src/generated/resources/metadata.json
@@ -3865,7 +3865,7 @@
     "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",
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 96c6c54d090..7a64a96ad91 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
@@ -7989,7 +7989,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * Jetty (camel-jetty)
-     * Expose HTTP endpoints using Jetty 9.
+     * Expose HTTP endpoints using Jetty 11.
      * 
      * Category: http
      * Since: 1.2
@@ -8009,7 +8009,7 @@ public class StaticEndpointBuilders {
     }
     /**
      * Jetty (camel-jetty)
-     * Expose HTTP endpoints using Jetty 9.
+     * Expose HTTP endpoints using Jetty 11.
      * 
      * Category: http
      * Since: 1.2
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 d8e0a069a4e..28bd2590862 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
@@ -27,7 +27,7 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * Expose HTTP endpoints using Jetty 9.
+ * Expose HTTP endpoints using Jetty 11.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -1218,7 +1218,7 @@ public interface JettyHttpEndpointBuilderFactory {
     public interface JettyHttpBuilders {
         /**
          * Jetty (camel-jetty)
-         * Expose HTTP endpoints using Jetty 9.
+         * Expose HTTP endpoints using Jetty 11.
          * 
          * Category: http
          * Since: 1.2
@@ -1231,7 +1231,7 @@ public interface JettyHttpEndpointBuilderFactory {
         }
         /**
          * Jetty (camel-jetty)
-         * Expose HTTP endpoints using Jetty 9.
+         * Expose HTTP endpoints using Jetty 11.
          * 
          * Category: http
          * Since: 1.2
@@ -1250,7 +1250,7 @@ public interface JettyHttpEndpointBuilderFactory {
         }
         /**
          * Jetty (camel-jetty)
-         * Expose HTTP endpoints using Jetty 9.
+         * Expose HTTP endpoints using Jetty 11.
          * 
          * Category: http
          * Since: 1.2
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] 01/05: 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 ef2a60f00a5e72861383d1cdb3b0224a9fcd845b
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Nov 30 19:08:41 2022 +0100

    Rewrite script
---
 jakarta/rewrite.java | 568 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 568 insertions(+)

diff --git a/jakarta/rewrite.java b/jakarta/rewrite.java
new file mode 100755
index 00000000000..bc55ad48238
--- /dev/null
+++ b/jakarta/rewrite.java
@@ -0,0 +1,568 @@
+///usr/bin/env jbang "$0" "$@" ; exit $?
+//DEPS info.picocli:picocli:4.5.0
+
+import java.io.IOError;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.nio.charset.MalformedInputException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.Callable;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+
+import picocli.CommandLine;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
+import picocli.CommandLine.Parameters;
+
+@Command(name = "rewrite")
+class rewrite implements Callable<Integer> {
+
+    public static void main(String... args) throws Exception {
+        int exitCode = new CommandLine(new rewrite()).execute(args);
+        System.exit(exitCode);
+    }
+
+        
+    @Override
+    public Integer call() throws Exception {
+        // Rebase on top of main
+        // exec("git", "checkout", "jakarta-rewrite");
+        // Create/reset branch 'rewritten'
+        // exec("git", "checkout", "-B", "jakarta-rewritten", "jakarta-rewrite");
+
+        // Switch version to 4.0.0-SNAPSHOT
+        System.out.println("Switch version to 4.0.0-SNAPSHOT");
+        try (Stream<Path> files = Files.walk(Paths.get("."))) {
+            files.forEach(p -> {
+                String name = p.getFileName().toString();
+                if (name.equals("pom.xml")) {
+                    regex(p, "<version>3\\.20\\.0-SNAPSHOT</version>", "<version>4.0.0-SNAPSHOT</version>");
+                } else if (p.toString().contains("/src/generated/resources/")) {
+                    if (name.endsWith(".properties")) {
+                        regex(p, "version=3.20.0-SNAPSHOT", "version=4.0.0-SNAPSHOT");
+                    } else if (name.endsWith(".json")) {
+                        regex(p, "\"version\": \"3\\.20\\.0-SNAPSHOT\"", "\"version\": \"4.0.0-SNAPSHOT\"");
+                    }
+                }
+            });
+        }
+
+        // Remove OSGi support
+        System.out.println("Remove OSGi support");
+        try (Stream<Path> files = Files.walk(Paths.get("."))) {
+            files
+                .filter(p -> p.getFileName().toString().equals("pom.xml"))
+                .forEach(p -> regex(p, 
+                        " *<([^>]+-version-range)>[^<]+</\\1> *\n", "",
+                        " *<(camel\\.osgi\\.[^>]+)(>[^<]+</\\1>| *\\/>) *\n", "",
+                        " *<!-- OSGi bundles properties --> *\n", "",
+                        " *<(plugin|pluginExecutionFilter)>\\s*<groupId>org.apache.camel</groupId>\\s*<artifactId>camel-bundle-plugin</artifactId>[\\s\\S]*?</\\1> *\n", "",
+                        " *<module>init</module> *\n", ""
+                ));
+        }
+        regex(Paths.get("components/camel-jasypt/pom.xml"), "<manifestFile>.*?</manifestFile>\\s*", "");
+
+        // Switch to javax.annotation.processing.Generated
+        System.out.println("Switch to javax.annotation.processing.Generated");
+        try (Stream<Path> files = Files.walk(Paths.get("."))) {
+            files
+                .filter(p -> {
+                    String name = p.getFileName().toString();
+                    return name.endsWith(".java") || name.endsWith(".txt") || name.endsWith(".vm");
+                })
+                .forEach(p -> regex(p, 
+                    "javax.annotation.Generated", "javax.annotation.processing.Generated"
+                ));
+        }
+
+        // Add support for jakarta in checkstyle
+        System.out.println("Add support for jakarta in checkstyle");
+        try (Stream<Path> files = Stream.of(
+                            "pom.xml", 
+                            "etc/pom.xml", 
+                            "buildingtools/src/main/resources/camel-checkstyle.xml").map(Paths::get)) {
+            files.forEach(p -> regex(p, 
+                    "java;javax;org.w3c;org.xml;w3c;", "java;jakarta;javax;org.w3c;org.xml;w3c;",
+                    "java,javax,org.w3c,org.xml,junit", "java,jakarta,javax,org.w3c,org.xml,junit"
+            ));
+        }
+
+        // Switch javax packages to jakarta
+        System.out.println("Switch javax packages to jakarta");
+        try (Stream<Path> files = Files.walk(Paths.get("."))) {
+            files
+            .filter(p ->
+                    p.getFileName().toString().endsWith(".java") && !p.toString().equals("jakarta/rewrite.java")
+                || p.getFileName().toString().endsWith(".json") && p.toString().contains("/src/generated/resources/"))
+            .forEach(p -> regex(p, 
+                "javax\\.activation", "jakarta\\.activation",
+                "javax\\.annotation\\.security", "jakarta\\.annotation\\.security",
+                "javax\\.annotation\\.sql", "jakarta\\.annotation\\.sql",
+                "javax\\.annotation(?!\\.processing)", "jakarta\\.annotation",
+                "javax\\.batch\\.api\\.chunk\\.listener", "jakarta\\.batch\\.api\\.chunk\\.listener",
+                "javax\\.batch\\.api\\.chunk", "jakarta\\.batch\\.api\\.chunk",
+                "javax\\.batch\\.api\\.listener", "jakarta\\.batch\\.api\\.listener",
+                "javax\\.batch\\.api\\.partition", "jakarta\\.batch\\.api\\.partition",
+                "javax\\.batch\\.api", "jakarta\\.batch\\.api",
+                "javax\\.batch\\.operations", "jakarta\\.batch\\.operations",
+                "javax\\.batch\\.runtime\\.context", "jakarta\\.batch\\.runtime\\.context",
+                "javax\\.batch\\.runtime", "jakarta\\.batch\\.runtime",
+                "javax\\.decorator", "jakarta\\.decorator",
+                "javax\\.ejb\\.embeddable", "jakarta\\.ejb\\.embeddable",
+                "javax\\.ejb\\.spi", "jakarta\\.ejb\\.spi",
+                "javax\\.ejb", "jakarta\\.ejb",
+                "javax\\.el", "jakarta\\.el",
+                "javax\\.enterprise\\.concurrent", "jakarta\\.enterprise\\.concurrent",
+                "javax\\.enterprise\\.context\\.control", "jakarta\\.enterprise\\.context\\.control",
+                "javax\\.enterprise\\.context\\.spi", "jakarta\\.enterprise\\.context\\.spi",
+                "javax\\.enterprise\\.context", "jakarta\\.enterprise\\.context",
+                "javax\\.enterprise\\.event", "jakarta\\.enterprise\\.event",
+                "javax\\.enterprise\\.inject\\.literal", "jakarta\\.enterprise\\.inject\\.literal",
+                "javax\\.enterprise\\.inject\\.se", "jakarta\\.enterprise\\.inject\\.se",
+                "javax\\.enterprise\\.inject\\.spi\\.configurator", "jakarta\\.enterprise\\.inject\\.spi\\.configurator",
+                "javax\\.enterprise\\.inject\\.spi", "jakarta\\.enterprise\\.inject\\.spi",
+                "javax\\.enterprise\\.inject", "jakarta\\.enterprise\\.inject",
+                "javax\\.enterprise\\.util", "jakarta\\.enterprise\\.util",
+                "javax\\.faces\\.annotation", "jakarta\\.faces\\.annotation",
+                "javax\\.faces\\.application", "jakarta\\.faces\\.application",
+                "javax\\.faces\\.bean", "jakarta\\.faces\\.bean",
+                "javax\\.faces\\.component\\.behavior", "jakarta\\.faces\\.component\\.behavior",
+                "javax\\.faces\\.component\\.html", "jakarta\\.faces\\.component\\.html",
+                "javax\\.faces\\.component\\.search", "jakarta\\.faces\\.component\\.search",
+                "javax\\.faces\\.component\\.visit", "jakarta\\.faces\\.component\\.visit",
+                "javax\\.faces\\.component", "jakarta\\.faces\\.component",
+                "javax\\.faces\\.context", "jakarta\\.faces\\.context",
+                "javax\\.faces\\.convert", "jakarta\\.faces\\.convert",
+                "javax\\.faces\\.el", "jakarta\\.faces\\.el",
+                "javax\\.faces\\.event", "jakarta\\.faces\\.event",
+                "javax\\.faces\\.flow\\.builder", "jakarta\\.faces\\.flow\\.builder",
+                "javax\\.faces\\.flow", "jakarta\\.faces\\.flow",
+                "javax\\.faces\\.lifecycle", "jakarta\\.faces\\.lifecycle",
+                "javax\\.faces\\.model", "jakarta\\.faces\\.model",
+                "javax\\.faces\\.push", "jakarta\\.faces\\.push",
+                "javax\\.faces\\.render", "jakarta\\.faces\\.render",
+                "javax\\.faces\\.validator", "jakarta\\.faces\\.validator",
+                "javax\\.faces\\.view\\.facelets", "jakarta\\.faces\\.view\\.facelets",
+                "javax\\.faces\\.view", "jakarta\\.faces\\.view",
+                "javax\\.faces\\.webapp", "jakarta\\.faces\\.webapp",
+                "javax\\.faces", "jakarta\\.faces",
+                "javax\\.inject", "jakarta\\.inject",
+                "javax\\.interceptor", "jakarta\\.interceptor",
+                "javax\\.jms", "jakarta\\.jms",
+                "javax\\.json\\.bind\\.adapter", "jakarta\\.json\\.bind\\.adapter",
+                "javax\\.json\\.bind\\.annotation", "jakarta\\.json\\.bind\\.annotation",
+                "javax\\.json\\.bind\\.config", "jakarta\\.json\\.bind\\.config",
+                "javax\\.json\\.bind\\.serializer", "jakarta\\.json\\.bind\\.serializer",
+                "javax\\.json\\.bind\\.spi", "jakarta\\.json\\.bind\\.spi",
+                "javax\\.json\\.bind", "jakarta\\.json\\.bind",
+                "javax\\.json\\.spi", "jakarta\\.json\\.spi",
+                "javax\\.json\\.stream", "jakarta\\.json\\.stream",
+                "javax\\.json", "jakarta\\.json",
+                "javax\\.jws\\.soap", "jakarta\\.jws\\.soap",
+                "javax\\.jws", "jakarta\\.jws",
+                "javax\\.mail\\.event", "jakarta\\.mail\\.event",
+                "javax\\.mail\\.internet", "jakarta\\.mail\\.internet",
+                "javax\\.mail\\.search", "jakarta\\.mail\\.search",
+                "javax\\.mail\\.util", "jakarta\\.mail\\.util",
+                "javax\\.mail", "jakarta\\.mail",
+                "javax\\.persistence\\.criteria", "jakarta\\.persistence\\.criteria",
+                "javax\\.persistence\\.metamodel", "jakarta\\.persistence\\.metamodel",
+                "javax\\.persistence\\.spi", "jakarta\\.persistence\\.spi",
+                "javax\\.persistence", "jakarta\\.persistence",
+                "javax\\.resource\\.cci", "jakarta\\.resource\\.cci",
+                "javax\\.resource\\.spi\\.endpoint", "jakarta\\.resource\\.spi\\.endpoint",
+                "javax\\.resource\\.spi\\.security", "jakarta\\.resource\\.spi\\.security",
+                "javax\\.resource\\.spi\\.work", "jakarta\\.resource\\.spi\\.work",
+                "javax\\.resource\\.spi", "jakarta\\.resource\\.spi",
+                "javax\\.resource", "jakarta\\.resource",
+                "javax\\.security\\.auth\\.message\\.callback", "jakarta\\.security\\.auth\\.message\\.callback",
+                "javax\\.security\\.auth\\.message\\.config", "jakarta\\.security\\.auth\\.message\\.config",
+                "javax\\.security\\.auth\\.message\\.module", "jakarta\\.security\\.auth\\.message\\.module",
+                "javax\\.security\\.auth\\.message", "jakarta\\.security\\.auth\\.message",
+                "javax\\.security\\.enterprise\\.authentication\\.mechanism\\.http", "jakarta\\.security\\.enterprise\\.authentication\\.mechanism\\.http",
+                "javax\\.security\\.enterprise\\.credential", "jakarta\\.security\\.enterprise\\.credential",
+                "javax\\.security\\.enterprise\\.identitystore", "jakarta\\.security\\.enterprise\\.identitystore",
+                "javax\\.security\\.enterprise", "jakarta\\.security\\.enterprise",
+                "javax\\.security\\.jacc", "jakarta\\.security\\.jacc",
+                "javax\\.servlet\\.annotation", "jakarta\\.servlet\\.annotation",
+                "javax\\.servlet\\.descriptor", "jakarta\\.servlet\\.descriptor",
+                "javax\\.servlet\\.http", "jakarta\\.servlet\\.http",
+                "javax\\.servlet\\.jsp\\.el", "jakarta\\.servlet\\.jsp\\.el",
+                "javax\\.servlet\\.jsp\\.jstl\\.core", "jakarta\\.servlet\\.jsp\\.jstl\\.core",
+                "javax\\.servlet\\.jsp\\.jstl\\.fmt", "jakarta\\.servlet\\.jsp\\.jstl\\.fmt",
+                "javax\\.servlet\\.jsp\\.jstl\\.sql", "jakarta\\.servlet\\.jsp\\.jstl\\.sql",
+                "javax\\.servlet\\.jsp\\.jstl\\.tlv", "jakarta\\.servlet\\.jsp\\.jstl\\.tlv",
+                "javax\\.servlet\\.jsp\\.jstl", "jakarta\\.servlet\\.jsp\\.jstl",
+                "javax\\.servlet\\.jsp\\.resources", "jakarta\\.servlet\\.jsp\\.resources",
+                "javax\\.servlet\\.jsp\\.tagext", "jakarta\\.servlet\\.jsp\\.tagext",
+                "javax\\.servlet\\.jsp", "jakarta\\.servlet\\.jsp",
+                "javax\\.servlet\\.resources", "jakarta\\.servlet\\.resources",
+                "javax\\.servlet", "jakarta\\.servlet",
+                "javax\\.transaction", "jakarta\\.transaction",
+                "javax\\.validation\\.bootstrap", "jakarta\\.validation\\.bootstrap",
+                "javax\\.validation\\.constraints", "jakarta\\.validation\\.constraints",
+                "javax\\.validation\\.constraintvalidation", "jakarta\\.validation\\.constraintvalidation",
+                "javax\\.validation\\.executable", "jakarta\\.validation\\.executable",
+                "javax\\.validation\\.groups", "jakarta\\.validation\\.groups",
+                "javax\\.validation\\.metadata", "jakarta\\.validation\\.metadata",
+                "javax\\.validation\\.spi", "jakarta\\.validation\\.spi",
+                "javax\\.validation\\.valueextraction", "jakarta\\.validation\\.valueextraction",
+                "javax\\.validation", "jakarta\\.validation",
+                "javax\\.websocket\\.server", "jakarta\\.websocket\\.server",
+                "javax\\.websocket", "jakarta\\.websocket",
+                "javax\\.ws\\.rs\\.client", "jakarta\\.ws\\.rs\\.client",
+                "javax\\.ws\\.rs\\.container", "jakarta\\.ws\\.rs\\.container",
+                "javax\\.ws\\.rs\\.core", "jakarta\\.ws\\.rs\\.core",
+                "javax\\.ws\\.rs\\.ext", "jakarta\\.ws\\.rs\\.ext",
+                "javax\\.ws\\.rs\\.sse", "jakarta\\.ws\\.rs\\.sse",
+                "javax\\.ws\\.rs", "jakarta\\.ws\\.rs",
+                "javax\\.xml\\.bind\\.annotation\\.adapters", "jakarta\\.xml\\.bind\\.annotation\\.adapters",
+                "javax\\.xml\\.bind\\.annotation", "jakarta\\.xml\\.bind\\.annotation",
+                "javax\\.xml\\.bind\\.attachment", "jakarta\\.xml\\.bind\\.attachment",
+                "javax\\.xml\\.bind\\.helpers", "jakarta\\.xml\\.bind\\.helpers",
+                "javax\\.xml\\.bind\\.util", "jakarta\\.xml\\.bind\\.util",
+                "javax\\.xml\\.bind", "jakarta\\.xml\\.bind",
+                "javax\\.xml\\.soap", "jakarta\\.xml\\.soap",
+                "javax\\.xml\\.ws\\.handler\\.soap", "jakarta\\.xml\\.ws\\.handler\\.soap",
+                "javax\\.xml\\.ws\\.handler", "jakarta\\.xml\\.ws\\.handler",
+                "javax\\.xml\\.ws\\.http", "jakarta\\.xml\\.ws\\.http",
+                "javax\\.xml\\.ws\\.soap", "jakarta\\.xml\\.ws\\.soap",
+                "javax\\.xml\\.ws\\.spi\\.http", "jakarta\\.xml\\.ws\\.spi\\.http",
+                "javax\\.xml\\.ws\\.spi", "jakarta\\.xml\\.ws\\.spi",
+                "javax\\.xml\\.ws\\.wsaddressing", "jakarta\\.xml\\.ws\\.wsaddressing",
+                "javax\\.xml\\.ws", "jakarta\\.xml\\.ws"
+            ));
+        }
+
+        // Switch POMs to jakarta specs and other upgrades
+        System.out.println("Switch POMs to jakarta specs and other upgrades");
+        try (Stream<Path> files = Files.walk(Paths.get("."))) {
+            files
+                .filter(p -> p.getFileName().toString().equals("pom.xml"))
+                .forEach(p -> regex(p, 
+                    // Mail
+                    "<(jakarta-mail-version)>.*?</\\1>", "<$1>2.0.1</$1>",
+                    "<(mock-javamail-version)>.*?</\\1>", "<$1>2.0</$1>",
+                    // JAXB
+                    "jaxb-api-version", "jakarta-xml-bind-api-version",
+                    "jakarta-jaxb-version", "jakarta-xml-bind-api-version",
+                    "(<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>",
+                    "(<dependency>\\s*<groupId>jakarta\\.xml\\.bind</groupId>\\s*<artifactId>jakarta\\.xml\\.bind-api</artifactId>\\s*)<version>.*?</version>", "$1<version>\\$\\{jakarta-xml-bind-api-version\\}</version>",
+                    "<(jakarta-xml-bind-api-version)>.*?</\\1>", "<$1>4.0.0</$1>",
+                    "<(glassfish-jaxb-runtime-version)>.*?</\\1>", "<$1>4.0.1</$1>",
+                    "<(jaxb2-maven-plugin-version)>.*?</\\1>", "<$1>3.1.0</$1>",
+                    "<(jaxb-core-version)>.*?</\\1>", "<$1>4.0.1</$1>",
+                    "<(jaxb-impl-version)>.*?</\\1>", "<$1>4.0.1</$1>",
+                    "<(jaxb-osgi-version)>.*?</\\1>", "<$1>4.0.1</$1>",
+                    // Activation
+                    "javax-activation-version", "jakarta-activation-version",
+                    "<(jakarta-activation-version)>.*?</\\1>", "<$1>2.0.1</$1>",
+                    "(<dependency>\\s*<groupId>com\\.sun\\.activation</groupId>\\s*)<artifactId>javax\\.activation</artifactId>", "$1<artifactId>jakarta.activation</artifactId>",
+                    "(<dependency>\\s*(<\\!--.*?-->\\s*)?)<groupId>javax\\.activation</groupId>(\\s*)<artifactId>javax\\.activation-api</artifactId>", "$1<groupId>jakarta.activation</groupId>$3<artifactId>jakarta.activation-api</artifactId>",
+                    // Annotations
+                    "javax-annotation-api-version", "jakarta-annotation-api-version",
+                    "<(jakarta-annotation-api-version)>.*?</\\1>", "<$1>2.1.1</$1>",
+                    "(<dependency>\\s*)<groupId>javax\\.annotation</groupId>(\\s*)<artifactId>javax\\.annotation-api</artifactId>", "$1<groupId>jakarta.annotation</groupId>$2<artifactId>jakarta.annotation-api</artifactId>",
+                    "(<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>",
+                    "(<dependency>\\s*<groupId>jakarta\\.annotation</groupId>\\s*<artifactId>jakarta\\.annotation-api</artifactId>\\s*)<version>.*?</version>", "$1<version>\\$\\{jakarta-annotation-api-version\\}</version>",
+                    // Spring
+                    " *<(spring5-version)>.*?</\\1> *\n", "",
+                    "spring5-version", "spring-version",
+                    "<(spring-version)>.*?</\\1>", "<$1>6.0.2</$1>",
+                    "<(spring-ws-version)>.*?</\\1>", "<$1>4.0.0</$1>",
+                    // CDI
+                    "weld3-version", "weld-version",
+                    "<(weld-version)>.*?</\\1>", "<$1>5.1.0.Final</$1>",
+                    "cdi-api-2.0-version", "jakarta-enterprise-cdi-api-version",
+                    "jakarta-cdi-api-version", "jakarta-enterprise-cdi-api-version",
+                    "<(jakarta-enterprise-cdi-api-version)>.*?</\\1>", "<$1>4.0.1</$1>",
+                    "(<dependency>\\s*)<groupId>javax\\.enterprise</groupId>(\\s+)<artifactId>cdi-api</artifactId>", "$1<groupId>jakarta.enterprise</groupId>$2<artifactId>jakarta.enterprise.cdi-api</artifactId>",
+                    // JMS
+                    "geronimo-jms-spec-version", "jakarta-jms-api-version",
+                    "<(qpid-jms-client-version)>.*?</\\1>", "<$1>2.1.0</$1>",
+                    "<(jakarta-jms-api-version)>.*?</\\1>", "<$1>3.1.0</$1>",
+                    " *<(geronimo-jms2-spec-version)>.*?</\\1> *\n", "",
+                    "geronimo-jms2-spec-version", "jakarta-jms-api-version",
+                    "<artifactId>artemis-jms-", "<artifactId>artemis-jakarta-",
+                    "(<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>",
+                    "(<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>",
+                    "(<dependency>\\s*<groupId>jakarta.jms</groupId>\\s*<artifactId>jakarta.jms-api</artifactId>\\s*<version>[^<]*</version>\\s*</dependency>\\s*)<dependency>\\s*<groupId>jakarta.jms</groupId>\\s*<artifactId>jakarta.jms-api</artifactId>\\s*<version>[^<]*</version>\\s*</dependency>", "$1",
+                    // JPA
+                    "geronimo-jpa-spec-version", "jakarta-persistence-api-version",
+                    "<(jakarta-persistence-api-version)>.*?</\\1>", "<$1>3.1.0</$1>",
+                    "(<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>",
+                    // JTA
+                    "geronimo-jta-spec-version", "jakarta-transaction-api-version",
+                    "<(jakarta-transaction-api-version)>.*?</\\1>", "<$1>2.0.1</$1>",
+                    "(<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>",
+                    // Servlet
+                    "<(undertow-version)>.*?</\\1>", "<$1>2.3.0.Final</$1>",
+                    " *<(jetty9-version)>.*?</\\1> *\n", "",
+                    "jetty9-version", "jetty-version",
+                    "<(jetty-version)>.*?</\\1>", "<$1>11.0.12</$1>",
+                    "javax-servlet-api-version", "jakarta-servlet-api-version",
+                    "<(jakarta-servlet-api-version)>.*?</\\1>", "<$1>6.0.0</$1>",
+                    "(<groupId>org\\.eclipse\\.jetty\\.websocket</groupId>\\s*<artifactId>websocket)-(client|server|api)(</artifactId>)", "$1-jakarta-$2$3",
+                    "(<dependency>\\s*)<groupId>javax\\.servlet</groupId>(\\s*)<artifactId>javax\\.servlet-api</artifactId>", "$1<groupId>jakarta.servlet</groupId>$2<artifactId>jakarta.servlet-api</artifactId>",
+                    "<(cxf-version)>.*?</\\1>", "<$1>4.0.0-SNAPSHOT</$1>",
+                    "<(cxf-codegen-plugin-version)>.*?</\\1>", "<$1>4.0.0-SNAPSHOT</$1>",
+                    "<(cxf-xjc-plugin-version)>.*?</\\1>", "<$1>4.0.0</$1>",
+                    "<(cxf-xjc-utils-version)>.*?</\\1>", "<$1>4.0.0</$1>",
+                    "<frontEnd>jaxws21</frontEnd>", "<frontEnd>jaxws</frontEnd>",
+                    "Camel Jetty 9\\.x support", "Camel Jetty 11.x support",
+                    "<atmosphere-version>2.6.4</atmosphere-version>", "<atmosphere-version>3.0.2</atmosphere-version>",
+                    "<(cometd-java-server)>.*?</\\1>", "<$1>7.0.9</$1>",
+                    "<(cometd-java-client-version)>.*?</\\1>", "<$1>7.0.9</$1>",
+                    "<artifactId>cometd-java-server</artifactId>", "<artifactId>cometd-java-server-websocket-jetty</artifactId>",
+                    "<artifactId>cometd-java-client</artifactId>", "<artifactId>cometd-java-client-websocket-jetty</artifactId>",
+                    "cometd-java-server(?!-websocket-jetty)", "cometd-java-server-version",
+                    " *<dependency>\\s*<groupId>org.cometd.java</groupId>\\s*<artifactId>bayeux-api</artifactId>\\s*<version>[^<]+</version>\\s*</dependency> *\n", "",
+                    // JAXWS
+                    "<(jaxb-jxc-version)>.*?</\\1>", "<$1>4.0.1</$1>",
+                    "<(jaxb-xjc-version)>.*?</\\1>", "<$1>4.0.1</$1>",
+                    "<(javax-soap-api-version)>.*?</\\1>", "<$1>3.0.0</$1>",
+                    "geronimo-ws-metadata-spec-version", "jakarta-jws-api-version",
+                    "jaxws-api-version", "jakarta-xml-ws-api-version",
+                    "javax-soap-api-version", "jakarta-xml-soap-api-version",
+                    "<(jakarta-xml-soap-api-version)>.*?</\\1>", "<$1>3.0.0</$1>",
+                    "<(jakarta-xml-ws-api-version)>.*?</\\1>", "<$1>4.0.0</$1>",
+                    "<(jakarta-jws-api-version)>.*?</\\1>", "<$1>3.0.0</$1>",
+                    "(<dependency>\\s*)<groupId>javax\\.xml\\.ws</groupId>(\\s*)<artifactId>jaxws-api</artifactId>", "$1<groupId>jakarta.xml.ws</groupId>$2<artifactId>jakarta.xml.ws-api</artifactId>",
+                    "(<dependency>\\s*)<groupId>org\\.apache\\.geronimo\\.specs</groupId>(\\s*)<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>", "$1<groupId>jakarta.jws</groupId>$2<artifactId>jakarta.jws-api</artifactId>",
+                    "(<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>",
+                    // JSON
+                    "(<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>",
+                    "(<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>",
+                    "(<dependency>\\s*)<groupId>org.apache.geronimo.specs</groupId>(\\s*)<artifactId>geronimo-jms_1.1_spec</artifactId>", "$1<groupId>jakarta.jms</groupId>$2<artifactId>jakarta.jws-api</artifactId>",
+                    "(<dependency>\\s*<groupId>jakarta\\.json</groupId>\\s*<artifactId>jakarta\\.json-api</artifactId>\\s*)<version>.*?</version>", "$1<version>\\$\\{jakarta-json-api-version\\}</version>",
+                    "(<dependency>\\s*<groupId>jakarta\\.json\\.bind</groupId>\\s*<artifactId>jakarta\\.json\\.bind-api</artifactId>\\s*)<version>.*?</version>", "$1<version>\\$\\{jakarta-json-bind-api-version\\}</version>",
+                    "geronimo-json-spec-version", "jakarta-json-api-version",
+                    "geronimo-jsonb-spec-version", "jakarta-json-bind-api-version",
+                    "<(jakarta-json-api-version)>.*?</\\1>", "<$1>2.1.1</$1>",
+                    "<(jakarta-json-bind-api-version)>.*?</\\1>", "<$1>3.0.0</$1>",
+                    // Validator
+                    "<(hibernate-validator-version)>.*?</\\1>", "<$1>8.0.0.Final</$1>",
+                    // Citrus
+                    "<(citrus-version)>.*?</\\1>", "<$1>3.3.0</$1>",
+                    // RestEasy
+                    "<(resteasy-version)>.*?</\\1>", "<$1>6.2.1.Final</$1>",
+                    " *<dependency>\\s*<groupId>org.jboss.resteasy</groupId>\\s*<artifactId>resteasy-spring</artifactId>\\s*<scope>test</scope>\\s*</dependency>", "",
+                    "<groupId>com.fasterxml.jackson.jaxrs</groupId>(\\s*)<artifactId>jackson-jaxrs-json-provider</artifactId>", "<groupId>com.fasterxml.jackson.jakarta.rs</groupId>$1<artifactId>jackson-jakarta-rs-json-provider</artifactId>"
+                ));
+        }
+
+        regex(Paths.get("pom.xml"), "(( *)<jaxb-xjc-version>.*</jaxb-xjc-version>)", "$1\n$2<jaxb-jxc-version>4.0.1</jaxb-jxc-version>");
+        regex(Paths.get("parent/pom.xml"), 
+                "(<plugin>\\s*<groupId>org.codehaus.mojo</groupId>\\s*<artifactId>jaxb2-maven-plugin</artifactId>[\\s\\S]*?)(</dependencies>\\s*</plugin>)", 
+                "$1    <dependency>\n            <groupId>com.sun.xml.bind</groupId>\n             <artifactId>jaxb-xjc</artifactId>\n            <version>\\${jaxb-xjc-version}</version>\n        </dependency>\n        <dependency>\n            <groupId>com.sun.xml.bind</groupId>\n            <artifactId>jaxb-jxc</artifactId>\n            <version>\\${jaxb-jxc-version}</version>\n        </dependency>\n    $2");
+
+        // Spring
+        regex(Paths.get("components/camel-test/pom.xml"), "<module>camel-test-spring</module>", "<!--module>camel-test-spring</module-->");
+        regex(Paths.get("components/camel-spring-xml/src/test/java/org/apache/camel/spring/postprocessor/MagicAnnotationPostProcessor.java"),
+                "InstantiationAwareBeanPostProcessorAdapter", "SmartInstantiationAwareBeanPostProcessor",
+                "extends", "implements");
+
+        // CDI
+        regex(Paths.get("components/camel-test/pom.xml"), "<module>camel-test-cdi</module>", "<!--module>camel-test-cdi</module-->");
+        try (Stream<Path> files = Files.walk(Paths.get("components/camel-cdi/src"))) {
+            files
+            .filter(p -> p.getFileName().toString().endsWith(".java"))
+            .forEach(p -> regex(p, 
+                "manager\\.createInjectionTarget\\((.*?)\\)\\;", "manager\\.getInjectionTargetFactory(\n                $1).createInjectionTarget(null)\\;",
+                " @Override\\s+public boolean isNullable\\(\\)[\\s\n]+\\{\\s+return [^;]+;\\s+} *\n *\n", "",
+                "manager\\.fireEvent\\(([a-z]+), (.*?)\\);", "manager.getEvent().select($2).fire($1);",
+                "manager\\.fireEvent\\(([a-z]+)\\);", "manager.getEvent().fire($1);"
+            ));
+        }
+
+        // JAXB
+        regex(Paths.get("components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/mapper/DefaultNamespacePrefixMapper.java"),
+            "com.sun.xml.bind.marshaller", "org.glassfish.jaxb.runtime.marshaller");
+        regex(Paths.get("components/camel-jmx/src/main/resources/notifications.xsd"),
+            "jxb:version=\"1\\.0\"", "jxb:version=\"3\\.0\"");
+
+        // JMS
+        regex(Paths.get("parent/pom.xml"), 
+                " *<dependency>\\s+<groupId>jakarta.jms</groupId>\\s*<artifactId>jakarta.jms-api</artifactId>\\s+<version>\\$\\{geronimo-jms2-spec-version\\}</version>\\s+</dependency> *\n",
+                "");
+        regex(Paths.get("components/pom.xml"), 
+            "<module>camel-activemq</module>", "<!--module>camel-activemq</module-->",
+                "<module>camel-stomp</module>", "<!--module>camel-stomp</module-->");
+        regex(Paths.get("test-infra/pom.xml"), 
+            "<module>camel-test-infra-activemq</module>", "<!--module>camel-test-infra-activemq</module-->");
+        Stream.of("components/camel-jms/pom.xml", "components/camel-sjms/pom.xml",
+                        "components/camel-mllp/pom.xml", "components/camel-sjms2/pom.xml")
+            .map(Paths::get)
+            .forEach(p -> regex(p, 
+                "<artifactId>camel-test-infra-activemq</artifactId>", "<artifactId>camel-test-infra-artemis</artifactId>",
+                " *<dependency>\\s*<groupId>org.apache.activemq</groupId>\\s*<artifactId>activemq-[\\s\\S]*?</dependency> *", "",
+                "<build>\n( *)<plugins>", "<build>\n$1<testSourceDirectory>src/test/dummy</testSourceDirectory>\n$1<plugins>"));
+        Stream.of("components/camel-amqp/pom.xml", "components/camel-paho/pom.xml")
+            .map(Paths::get)
+            .forEach(p -> regex(p, 
+                "<artifactId>camel-test-infra-activemq</artifactId>", "<artifactId>camel-test-infra-artemis</artifactId>",
+                " *<dependency>\\s*<groupId>org.apache.activemq</groupId>\\s*<artifactId>activemq-[\\s\\S]*?</dependency> *", "",
+                "(( *)</dependencies> *\n)", "$1\n$2<build>\n$2    <testSourceDirectory>src/test/dummy</testSourceDirectory>\n$2</build>\n"));
+
+
+        // JAXWS
+        try (Stream<Path> files = Files.walk(Paths.get("components"))) {
+            files
+            .filter(p -> {
+                var name = p.getFileName().toString();
+                return name.endsWith(".xml") || name.endsWith(".xsd") || name.endsWith(".wsdl");
+            })
+            .forEach(p -> regex(p,
+                "(<web-app\s([^>]*\s)?)version=\"3\\.[0-9]\"", "$1version=\"6.0\"", 
+                "(<jaxb:bindings[^>]*\s(jaxb:)?)version=\"2\\.[0-9]\"", "$1version=\"3.0\"",
+                "http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd", "https://jakarta.ee/xml/ns/jaxb/bindingschema_3_0.xsd",
+                "http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd", "https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd",
+                "http://java.sun.com/xml/ns/jaxb(?!/xjc)", "https://jakarta.ee/xml/ns/jaxb",
+                "http://java.sun.com/xml/ns/jaxws", "https://jakarta.ee/xml/ns/jaxws",
+                "http://java.sun.com/xml/ns/javaee", "https://jakarta.ee/xml/ns/jakartaee"
+            ));
+        }
+
+        // Cometd
+        regex(Paths.get("components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java"), 
+            "channel\\.publish\\(serverSession, mutable\\)\\;", "channel.publish(serverSession, mutable, new org.cometd.bayeux.Promise<>() {});");
+        for (String path : List.of("Authenticated", "Extension")) {
+            regex(Paths.get("components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractive" + path + "ManualTest.java"), 
+                "ServerSession\\.RemoveListener", "ServerSession.RemovedListener",
+                "removed\\(ServerSession session, boolean timeout\\)", "removed(ServerSession session, ServerMessage message, boolean timeout)");
+        }
+
+        // Consul + Google Sheets
+        Stream.of("ConsulServiceCallWithRegistrationIT", "ConsulServiceRegistrationTestBase", "ConsulServiceDiscoveryIT")
+            .map(s -> "components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/" + s + ".java")
+            .map(Paths::get)
+            .forEach(p -> regex(p, 
+                "import org\\.springframework\\.util\\.SocketUtils;", "import org.apache.camel.test.AvailablePortFinder;",
+                "SocketUtils\\.findAvailableTcpPort\\(\\)", "AvailablePortFinder.getNextAvailable()"));
+
+        // Disable tests on google-sheets
+        // regex(Paths.get("components/camel-google/camel-google-sheets/pom.xml"),
+            // "<build>\n( *)<defaultGoal>", "<build>\n$1<testSourceDirectory>src/test/dummy</testSourceDirectory>\n$1<defaultGoal>",
+            // "(<execution>[\\s\\S]*?</execution>)", "<!-- $1 -->");
+
+        regex(Paths.get("components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java"),
+            "MediaType\\.APPLICATION_OCTET_STREAM", "APPLICATION_OCTET_STREAM",
+            "import jakarta\\.ws\\.rs\\.core\\.MediaType;\n*", "",
+            "(( *)private JcloudsBlobStoreHelper)", "$2private static final String APPLICATION_OCTET_STREAM = \"application/octet-stream\";\n$1");
+
+        // Johnzon
+        regex(Paths.get("components/pom.xml"),
+                "<module>camel-johnzon</module>", "<!--module>camel-johnzon</module-->");
+
+        // Add missing dependency
+        regex(Paths.get("components/camel-cxf/camel-cxf-common/pom.xml"), 
+                "(<dependency>\n(\\s*)<groupId>[^<]*</groupId>\n\\s*<artifactId>[^<]*</artifactId>\n\\s*<scope>test</scope>\n(\\s*)</dependency>)",
+                "<dependency>\n$2<groupId>jakarta.xml.soap</groupId>\n$2<artifactId>jakarta.xml.soap-api</artifactId>\n$3</dependency>\n\n$3$1");
+
+        // websockets
+        regex(Paths.get("components/pom.xml"),
+                "<module>camel-websocket</module>", "<!--module>camel-websocket</module-->");
+        regex(Paths.get("components/camel-websocket-jsr356/pom.xml"),
+                "<(tomcat\\.version)>.*?</\\1>", "<$1>10.0.27</$1>",
+                "(( *)<dependency>\\s*<groupId>org.apache.tomcat</groupId>\\s*<artifactId>tomcat-websocket</artifactId>\\s*<version>\\$\\{tomcat.version\\}</version>\\s*<scope>test</scope>\\s*</dependency> *\n)",
+                "$1$2<dependency>\n" +
+                        "            <groupId>jakarta.enterprise</groupId>\n" +
+                        "            <artifactId>jakarta.enterprise.cdi-api</artifactId>\n" +
+                        "            <version>\\$\\{jakarta-enterprise-cdi-api-version\\}</version>\n" +
+                        "            <scope>test</scope>\n" +
+                        "        </dependency>\n");
+
+        // Add repo
+        regex(Paths.get("components/camel-mail/pom.xml"),
+            "</properties>", "</properties>\n\n            <repositories>\n                <repository>\n                    <id>central</id>\n                    <url>https://repo1.maven.org/maven2/</url>\n                </repository>\n                <repository>\n                    <id>jenkinsci-releases</id>\n                    <url>https://repo.jenkins-ci.org/releases/</url>\n                </repository>\n            </repositories>");
+
+        // Jackson JAXRS
+        Stream.of(
+                "components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/ServiceNowClient.java",
+                "components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/AbstractWordpressServiceAdapter.java",
+                "components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtil.java",
+                "components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPIBuilder.java")
+            .map(Paths::get)
+            .forEach(p -> regex(p, 
+                "com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider", "com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider"));
+
+        Stream.of("catalog/camel-allcomponents/pom.xml",
+                  "catalog/camel-catalog/pom.xml",
+                  "bom/camel-bom/pom.xml",
+                  "parent/pom.xml",
+                  "tests/camel-itest/pom.xml",
+                  "catalog/camel-route-parser/pom.xml")
+            .map(Paths::get)
+            .forEach(p -> regex(p, 
+                  " *<dependency>\\s*<groupId>org.apache.camel</groupId>\\s*<artifactId>camel-(activemq|johnzon|stomp|test-cdi|test-spring|websocket)</artifactId>[\\s\\S]*?</dependency> *\n+", ""));
+
+        // camel-jpa
+        regex(Paths.get("components/camel-jpa/pom.xml"),
+            "(<dependency>\\s*<groupId>jakarta.persistence</groupId>\\s*<artifactId>jakarta.persistence-api</artifactId>)\\s*<scope>provided</scope>(\\s*</dependency>)",
+            "$1$2");
+        // camel-cdi
+        regex(Paths.get("components/camel-cdi/pom.xml"),
+            "(<dependency>\\s*<groupId>jakarta.enterprise</groupId>\\s*<artifactId>jakarta.enterprise.cdi-api</artifactId>\\s*<version>[^<]*</version>)\\s*<scope>provided</scope>(\\s*</dependency>)",
+            "$1$2");
+
+        // camel-itest
+        regex(Paths.get("tests/camel-itest/pom.xml"),
+            "( *<\\!--.*?--> *\n)? *<dependency>\\s*<groupId>jakarta.transaction</groupId>\\s*<artifactId>jakarta.transaction-api</artifactId>[\\s\\S]*?</dependency> *\n", "",
+            " *<dependency>\\s*<groupId>org.apache.activemq</groupId>[\\s\\S]*?</dependency> *\n", "");
+        regex(Paths.get("tests/camel-itest/src/test/java/org/apache/camel/itest/CamelJmsTestHelper.java"),
+            "import org\\.apache\\.activemq\\.[^;]+; *\n", "",
+            "(create(Persistent)?ConnectionFactory\\(String options\\) \\{\\s*)[\\s\\S]*?return pooled;", "$1throw new UnsupportedOperationException();");
+
+        // Commit
+        exec("git", "commit", "-a", "-m", "Switch to jakarta namespace");
+
+        // Jetty 9 -> 11 migration
+        exec("git", "cherry-pick", "-x", "5e57bb6cc86bfdbc474f91fc2c152cb0fc03a9ff");
+        // Salesforce migration
+        exec("git", "cherry-pick", "-x", "eda15c498fb3834996924607e353ecb1e37cffcc");
+
+        // rm -Rf **\/src/generated target **\/target && mvn source:jar install -DskipTests 
+
+        return 0;
+    }
+
+    private static void regex(Path path, String... expressions) throws IOError {
+        try {
+            var org = Files.readString(path);
+            var content = org;
+            for (int i = 0; i < expressions.length; i += 2) {
+                content = content.replaceAll(expressions[i], expressions[i+1]);
+            }
+            if (!Objects.equals(org, content)) {
+                Files.writeString(path, content, StandardOpenOption.TRUNCATE_EXISTING);
+            }
+        } catch (MalformedInputException e) {
+            System.out.println("Ignoring file because of bad encoding: " + path);
+        } catch (IOException e) {
+            throw new IOError(new IOException("Error processing file: " + path, e));
+        }
+    }
+
+    private static void exec(String... cmd) throws IOException {
+        var pb = new ProcessBuilder(cmd);
+        pb.redirectInput(ProcessBuilder.Redirect.INHERIT);
+        pb.redirectOutput(ProcessBuilder.Redirect.INHERIT);
+        pb.redirectError(ProcessBuilder.Redirect.INHERIT);
+        Process p = pb.start();
+        try {
+            p.waitFor();
+        } catch (InterruptedException e) {
+            throw (InterruptedIOException) new InterruptedIOException("Command interrupted").initCause(e);
+        }
+        if (p.exitValue() != 0) {
+            throw new IOException("Error executing '" + String.join(" ", (CharSequence[]) cmd));
+        }
+    }
+}


[camel] 03/05: Switch to jakarta namespace

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 67ecb1ad2473790bc71eafa9d2d64f3b37cf3a89
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Dec 13 07:58:59 2022 +0100

    Switch to jakarta namespace
---
 apache-camel/pom.xml                               |   2 +-
 archetypes/camel-archetype-api-component/pom.xml   |   2 +-
 archetypes/camel-archetype-cdi/pom.xml             |   2 +-
 .../src/main/resources/archetype-resources/pom.xml |   8 +-
 .../src/main/java/MyRoutes.java                    |   2 +-
 .../src/main/java/SomeBean.java                    |   4 +-
 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                              |  32 +-
 bom/pom.xml                                        |   3 +-
 buildingtools/pom.xml                              |   2 +-
 .../src/main/resources/camel-checkstyle.xml        |   2 +-
 camel-dependencies/pom.xml                         |  96 +--
 catalog/camel-allcomponents/pom.xml                |  32 +-
 catalog/camel-catalog-console/pom.xml              |   6 +-
 catalog/camel-catalog-lucene/pom.xml               |   6 +-
 catalog/camel-catalog-maven/pom.xml                |   2 +-
 catalog/camel-catalog/pom.xml                      |   8 +-
 .../apache/camel/catalog/components/activemq.json  |  40 +-
 .../org/apache/camel/catalog/components/amqp.json  |  40 +-
 .../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   |   4 +-
 .../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   |  24 +-
 .../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  |  16 +-
 .../org/apache/camel/catalog/components/imaps.json |  16 +-
 .../catalog/components/infinispan-embedded.json    |   2 +-
 .../camel/catalog/components/infinispan.json       |   2 +-
 .../apache/camel/catalog/components/influxdb.json  |   2 +-
 .../apache/camel/catalog/components/influxdb2.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 |   8 +-
 .../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   |  40 +-
 .../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   |   8 +-
 .../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  |  16 +-
 .../org/apache/camel/catalog/components/pop3s.json |  16 +-
 .../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  |   4 +-
 .../camel/catalog/components/robotframework.json   |   2 +-
 .../apache/camel/catalog/components/rocketmq.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   |   4 +-
 .../org/apache/camel/catalog/components/sftp.json  |   2 +-
 .../org/apache/camel/catalog/components/sjms.json  |  20 +-
 .../org/apache/camel/catalog/components/sjms2.json |  20 +-
 .../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  |  16 +-
 .../org/apache/camel/catalog/components/smtps.json |  16 +-
 .../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 |   4 +-
 .../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                 |  16 +-
 .../camel/parser/java/MyCdiConcatRouteBuilder.java |   2 +-
 .../camel/parser/java/MyCdiRouteBuilder.java       |   2 +-
 catalog/dummy-component/pom.xml                    |   2 +-
 catalog/pom.xml                                    |  20 +-
 components/camel-activemq/pom.xml                  |   8 +-
 .../converter/ActiveMQMessageConverterLoader.java  |   4 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/activemq/activemq.json  |  40 +-
 .../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 +-
 components/camel-amqp/pom.xml                      |  18 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/amqp/amqp.json      |  40 +-
 .../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 +-
 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                      |   8 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../org/apache/camel/dataformat/asn1/asn1.json     |   2 +-
 components/camel-asterisk/pom.xml                  |   5 +-
 .../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      |  23 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../atmosphere/websocket/atmosphere-websocket.json |   4 +-
 .../websocket/CamelWebSocketServlet.java           |   8 +-
 .../atmosphere/websocket/WebsocketConsumer.java    |   8 +-
 components/camel-atom/pom.xml                      |   5 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/atom/atom.json      |   2 +-
 .../apache/camel/component/atom/MyHttpServlet.java |   6 +-
 components/camel-attachments/pom.xml               |   9 +-
 .../attachment/AttachmentConverterLoader.java      |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/attachments.json       |   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-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 +-
 .../camel/component/aws2/ses/Ses2Producer.java     |   4 +-
 .../camel/component/aws2/ses/MockMessage.java      |  12 +-
 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       |   8 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/azure/cosmosdb/azure-cosmosdb.json   |   2 +-
 .../camel-azure/camel-azure-eventhubs/pom.xml      |   8 +-
 .../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     |   8 +-
 .../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 +-
 .../BeanValidatorComponentConfigurer.java          |  20 +-
 .../validator/BeanValidatorEndpointConfigurer.java |  20 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/bean/validator/bean-validator.json   |  24 +-
 .../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 +-
 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                    |   9 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/bonita/bonita.json  |   2 +-
 .../camel/component/bonita/api/BonitaAPI.java      |   8 +-
 .../component/bonita/api/BonitaAPIBuilder.java     |   8 +-
 .../bonita/api/filter/BonitaAuthFilter.java        |  22 +-
 .../bonita/api/filter/JsonClientFilter.java        |   6 +-
 .../component/bonita/api/util/BonitaAPIUtil.java   |  12 +-
 .../api/BonitaAuthFilterAlreadyConnectedTest.java  |   4 +-
 .../bonita/api/BonitaAuthFilterConnectionTest.java |   6 +-
 .../component/bonita/api/BonitaAuthFilterTest.java |   4 +-
 components/camel-box/camel-box-api/pom.xml         |   5 +-
 .../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                 |   3 +-
 .../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         |  31 +-
 .../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                   |   8 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/cdi-jta.json           |   2 +-
 .../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 +-
 components/camel-cdi-main/pom.xml                  |   8 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/cdi-main.json          |   2 +-
 .../src/main/java/org/apache/camel/cdi/Main.java   |  14 +-
 components/camel-cdi/pom.xml                       |  22 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../camel-cdi/src/generated/resources/cdi.json     |   2 +-
 .../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    |  15 +-
 .../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    |  50 +-
 .../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     |  19 +-
 .../org/apache/camel/cdi/CdiEventNotifier.java     |   8 +-
 .../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   |  25 +-
 .../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 +-
 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 +-
 .../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 +-
 components/camel-cmis/pom.xml                      |   5 +-
 .../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                    |  20 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/cometd/cometd.json  |   2 +-
 .../org/apache/camel/component/cometd/cometds.json |   2 +-
 .../camel/component/cometd/CometdComponent.java    |   2 +-
 .../camel/component/cometd/CometdProducer.java     |   2 +-
 ...ConsumerInteractiveAuthenticatedManualTest.java |   4 +-
 ...ucerConsumerInteractiveExtensionManualTest.java |   4 +-
 components/camel-consul/pom.xml                    |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/consul/consul.json  |   2 +-
 .../cloud/ConsulServiceCallWithRegistrationIT.java |   6 +-
 .../consul/cloud/ConsulServiceDiscoveryIT.java     |   4 +-
 .../cloud/ConsulServiceRegistrationTestBase.java   |   4 +-
 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      |  45 +-
 .../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 +-
 components/camel-cxf/camel-cxf-rest/pom.xml        |  43 +-
 .../component/cxf/jaxrs/CxfConverterLoader.java    |  12 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/cxf/jaxrs/cxfrs.json    |   2 +-
 .../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 +-
 components/camel-cxf/camel-cxf-soap/pom.xml        |  45 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/cxf/jaxws/cxf.json  |   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 +-
 .../test/resources/person-non-wrapper-binding.xml  |   2 +-
 .../src/test/resources/person-non-wrapper.wsdl     |   2 +-
 .../camel-cxf/camel-cxf-spring-common/pom.xml      |  40 +-
 components/camel-cxf/camel-cxf-spring-rest/pom.xml |  38 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/cxf-spring-rest.json   |   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 +-
 components/camel-cxf/camel-cxf-spring-soap/pom.xml |  39 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/cxf-spring-soap.json   |   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 +-
 .../test/resources/person-non-wrapper-binding.xml  |   2 +-
 .../src/test/resources/person-non-wrapper.wsdl     |   2 +-
 .../camel-cxf/camel-cxf-spring-transport/pom.xml   |  25 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../generated/resources/cxf-spring-transport.json  |   2 +-
 .../main/resources/schema/configuration/camel.xsd  |   2 +-
 .../message/DefaultCxfMessageMapperTest.java       |   2 +-
 .../cxf/transport/CamelDestinationTest.java        |   6 +-
 .../cxf/transport/JaxWSCamelDestinationTest.java   |   2 +-
 .../cxf/transport/JaxWSCamelTestSupport.java       |  16 +-
 components/camel-cxf/camel-cxf-transport/pom.xml   |  28 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/cxf-transport.json     |   2 +-
 .../transport/message/DefaultCxfMessageMapper.java |   2 +-
 .../main/resources/schema/configuration/camel.xsd  |   2 +-
 .../message/DefaultCxfMessageMapperTest.java       |   2 +-
 .../cxf/transport/JaxWSCamelDestinationTest.java   |   2 +-
 .../cxf/transport/JaxWSCamelTestSupport.java       |  16 +-
 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            |  19 +-
 .../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                     |   6 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/dozer/dozer.json    |   2 +-
 .../camel/converter/dozer/MapperFactory.java       |   2 +-
 .../component/dozer/example/abc/ABCOrder.java      |  12 +-
 .../component/dozer/example/abc/ObjectFactory.java |   2 +-
 .../component/dozer/example/xyz/LineItem.java      |   2 +-
 .../component/dozer/example/xyz/XYZOrder.java      |   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                   |   6 +-
 .../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 |   6 +-
 .../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                  |   5 +-
 .../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                |   5 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/freemarker/freemarker.json     |   2 +-
 .../freemarker/FreemarkerAttachmentsTest.java      |   4 +-
 components/camel-ftp/pom.xml                       |   5 +-
 .../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     |   3 +-
 .../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 |   3 +-
 .../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  |   3 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/google/mail/google-mail.json   |   2 +-
 .../google/mail/stream/google-mail-stream.json     |   2 +-
 .../google/mail/GmailUsersMessagesIT.java          |   8 +-
 .../component/google/mail/GmailUsersThreadsIT.java |   8 +-
 .../camel-google/camel-google-pubsub/pom.xml       |   3 +-
 .../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       |   3 +-
 .../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                      |   6 +-
 .../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                    |  13 +-
 .../services/org/apache/camel/language.properties  |   2 +-
 .../org/apache/camel/language/groovy/groovy.json   |   2 +-
 components/camel-grpc/pom.xml                      |   6 +-
 .../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                 |   5 +-
 .../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                      |  16 +-
 .../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                       |   5 +-
 .../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               |  12 +-
 .../camel/http/common/HttpConverterLoader.java     |  10 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/http-common.json       |   2 +-
 .../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 +-
 components/camel-http/pom.xml                      |  11 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/http/http.json      |   2 +-
 .../org/apache/camel/component/http/https.json     |   2 +-
 .../http/handler/SessionReflectionHandler.java     |   8 +-
 .../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                      |   7 +-
 .../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-influxdb2/pom.xml                 |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/influxdb2/influxdb2.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              |   5 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../camel/component/jackson/avro/avroJackson.json  |   2 +-
 components/camel-jackson-protobuf/pom.xml          |   5 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../jackson/protobuf/protobufJackson.json          |   2 +-
 components/camel-jackson/pom.xml                   |   5 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../apache/camel/component/jackson/jackson.json    |   2 +-
 .../camel/component/jackson/TestJAXBPojo.java      |   4 +-
 .../camel/component/jackson/converter/Order.java   |   8 +-
 components/camel-jacksonxml/pom.xml                |   5 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../camel/component/jacksonxml/jacksonXml.json     |   2 +-
 .../camel/component/jacksonxml/TestJAXBPojo.java   |   4 +-
 components/camel-jasypt/pom.xml                    |  12 +-
 .../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                      |   7 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../org/apache/camel/converter/jaxb/jaxb.json      |   2 +-
 .../converter/jaxb/FallbackTypeConverter.java      |  12 +-
 .../camel/converter/jaxb/JaxbDataFormat.java       |  16 +-
 .../apache/camel/converter/jaxb/JaxbHelper.java    |   2 +-
 .../converter/jaxb/JaxbNamespacePrefixMapper.java  |   2 +-
 .../jaxb/mapper/DefaultNamespacePrefixMapper.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 +-
 components/camel-jbpm/pom.xml                      |   6 +-
 .../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                   |   5 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/jclouds/jclouds.json    |   2 +-
 .../component/jclouds/JcloudsBlobStoreHelper.java  |   5 +-
 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              |  14 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/jetty-common.json      |   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 +-
 components/camel-jetty/pom.xml                     |  25 +-
 .../jetty9/JettyHttpEndpoint9Configurer.java       |   6 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/jetty9/jetty.json   |   8 +-
 .../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 +-
 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                       |  49 +-
 .../component/jms/JmsComponentConfigurer.java      |   8 +-
 .../camel/component/jms/JmsEndpointConfigurer.java |   8 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/jms/jms.json        |  40 +-
 .../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 |  24 +-
 .../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 +-
 components/camel-jmx/pom.xml                       |   6 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/jmx/jmx.json        |   2 +-
 .../component/jmx/NotificationXmlFormatter.java    |   6 +-
 .../camel-jmx/src/main/resources/notifications.xsd |   4 +-
 components/camel-johnzon/pom.xml                   |   8 +-
 .../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                      |   8 +-
 .../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                       |  15 +-
 .../component/jpa/JpaComponentConfigurer.java      |   4 +-
 .../camel/component/jpa/JpaEndpointConfigurer.java |   4 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/jpa/jpa.json        |   8 +-
 .../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 +-
 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                      |   5 +-
 .../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                     |  14 +-
 .../component/jsonb/JsonbDataFormatConfigurer.java |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../org/apache/camel/component/jsonb/jsonb.json    |   2 +-
 .../camel/component/jsonb/JsonbDataFormat.java     |  12 +-
 .../component/jsonb/JsonbAttributeOrderTest.java   |   2 +-
 components/camel-jsonpath/pom.xml                  |   7 +-
 .../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                       |   6 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../camel-jta/src/generated/resources/jta.json     |   2 +-
 .../apache/camel/jta/TransactionErrorHandler.java  |   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                |   6 +-
 .../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                   |  10 +-
 .../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                    |   5 +-
 .../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 +-
 ...osoftExchangeOnlineOAuth2MailAuthenticator.java |   2 +-
 components/camel-mail/pom.xml                      |  16 +-
 .../component/mail/MailComponentConfigurer.java    |   4 +-
 .../camel/component/mail/MailConvertersLoader.java |  16 +-
 .../component/mail/MailEndpointConfigurer.java     |   8 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../org/apache/camel/component/mail/imap.json      |  16 +-
 .../org/apache/camel/component/mail/imaps.json     |  16 +-
 .../org/apache/camel/component/mail/pop3.json      |  16 +-
 .../org/apache/camel/component/mail/pop3s.json     |  16 +-
 .../org/apache/camel/component/mail/smtp.json      |  16 +-
 .../org/apache/camel/component/mail/smtps.json     |  16 +-
 .../dataformat/mime/multipart/mimeMultipart.json   |   2 +-
 ...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 +-
 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              |   8 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../generated/resources/microprofile-health.json   |   2 +-
 ...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 +-
 .../camel-microprofile-metrics/pom.xml             |  14 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../microprofile/metrics/microprofile-metrics.json |   2 +-
 components/camel-microprofile/pom.xml              |   2 +-
 components/camel-milo/pom.xml                      |   6 +-
 .../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 +-
 .../milo/client/MiloClientConfiguration.java       |   2 +-
 components/camel-mina/pom.xml                      |   3 +-
 .../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                      |   5 +-
 .../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                   |   5 +-
 .../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                |   6 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/netty/http/netty-http.json     |   2 +-
 .../netty/http/NettyHttpProducerSessionTest.java   |   2 +-
 .../netty/http/SpringNettyHttpBasicAuthTest.java   |   2 +-
 .../netty/http/SpringNettyHttpSSLTest.java         |   2 +-
 .../component/netty/http/rest/UserJaxbPojo.java    |   8 +-
 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 |   5 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/olingo2-api.json       |   2 +-
 .../camel-olingo2/camel-olingo2-component/pom.xml  |   3 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/olingo2/olingo2.json    |   2 +-
 .../olingo2/Olingo2AppAPIETagEnabledTest.java      |   2 +-
 .../src/test/resources/olingo2_ref/WEB-INF/web.xml |   6 +-
 components/camel-olingo2/pom.xml                   |   2 +-
 components/camel-olingo4/camel-olingo4-api/pom.xml |   5 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/olingo4-api.json       |   2 +-
 .../camel-olingo4/camel-olingo4-component/pom.xml  |   3 +-
 .../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              |  14 +-
 .../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                      |   8 +-
 .../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 +-
 .../http/vertx/VertxPlatformHttpConsumer.java      |   2 +-
 .../http/vertx/VertxPlatformHttpEngineTest.java    |   2 +-
 components/camel-platform-http/pom.xml             |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/platform/http/platform-http.json     |   2 +-
 .../http/PlatformHttpHeaderFilterStrategy.java     |   2 +-
 .../http/JettyCustomPlatformHttpConsumer.java      |   4 +-
 components/camel-plc4x/pom.xml                     |   8 +-
 .../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                  |   5 +-
 .../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                  |   6 +-
 .../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              |   6 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/rest/openapi/rest-openapi.json |   2 +-
 .../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 +-
 components/camel-rest-swagger/pom.xml              |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/rest/swagger/rest-swagger.json |   2 +-
 .../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 +-
 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                  |  14 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/resteasy/resteasy.json  |   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 +-
 .../src/test/resources/web-no-spring.xml           |   4 +-
 .../camel-resteasy/src/test/resources/web.xml      |   4 +-
 .../src/test/resources/webTwoServlets.xml          |   4 +-
 .../src/test/resources/webWithoutAppContext.xml    |   4 +-
 .../src/test/resources/webWithoutAppContext2.xml   |   4 +-
 components/camel-robotframework/pom.xml            |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../component/robotframework/robotframework.json   |   2 +-
 components/camel-rocketmq/pom.xml                  |   2 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/rocketmq/rocketmq.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 +-
 .../apache/camel/component/rss/MyHttpServlet.java  |   6 +-
 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               |  19 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../generated/resources/salesforce-codegen.json    |   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 +-
 .../camel-salesforce-component/pom.xml             |  32 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/salesforce/salesforce.json     |   2 +-
 .../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/dto/generated/RecordType.java       |   2 +-
 .../salesforce/internal/streaming/StubServer.java  |   6 +-
 .../camel-salesforce-maven-plugin/pom.xml          |  25 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../resources/salesforce-maven-plugin.json         |   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 +-
 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                     |   5 +-
 .../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             |   9 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/servicenow/servicenow.json     |   2 +-
 .../servicenow/AbstractServiceNowProcessor.java    |   4 +-
 .../component/servicenow/ServiceNowClient.java     |   6 +-
 .../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 +-
 .../camel-servicenow-maven-plugin/pom.xml          |  19 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../resources/servicenow-maven-plugin.json         |   2 +-
 .../camel/maven/CamelServiceNowGenerateMojo.java   |   2 +-
 components/camel-servicenow/pom.xml                |   2 +-
 components/camel-servlet/pom.xml                   |  12 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/servlet/servlet.json    |   4 +-
 .../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 +-
 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                      |  25 +-
 .../component/sjms/SjmsComponentConfigurer.java    |   8 +-
 .../component/sjms/SjmsEndpointConfigurer.java     |   8 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/sjms/sjms.json      |  20 +-
 .../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       |  26 +-
 .../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 +-
 components/camel-sjms2/pom.xml                     |  32 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/sjms2/sjms2.json    |  20 +-
 .../component/sjms2/jms/Jms2ObjectFactory.java     |  14 +-
 .../sjms2/producer/InOnlyQueueProducerTest.java    |   6 +-
 .../sjms2/producer/InOnlyTopicProducerTest.java    |   6 +-
 .../component/sjms2/support/Jms2TestSupport.java   |   8 +-
 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                      |  17 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../org/apache/camel/dataformat/soap/soap.json     |   2 +-
 .../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 +-
 .../org/apache/camel/dataformat/soap/binding.xml   |   2 +-
 .../apache/camel/dataformat/soap/xjc-bindings.xml  |   4 +-
 components/camel-solr/pom.xml                      |   8 +-
 .../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 +-
 .../apache/camel/component/solr/SolrProducer.java  |   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                    |   5 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../org/apache/camel/component/splunk/splunk.json  |   2 +-
 components/camel-spring-batch/pom.xml              |   4 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/spring/batch/spring-batch.json |   2 +-
 components/camel-spring-integration/pom.xml        |   6 +-
 .../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               |   6 +-
 .../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              |   6 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/redis/spring-redis.json |   2 +-
 .../RedisStringIdempotentRepositoryManualIT.java   |   2 +-
 components/camel-spring-security/pom.xml           |   4 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/spring-security.json   |   2 +-
 components/camel-spring-ws/pom.xml                 |  24 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/spring/ws/spring-ws.json       |   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 +-
 components/camel-spring-xml/pom.xml                |  20 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/spring-xml.json        |   2 +-
 .../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 +-
 .../MagicAnnotationPostProcessor.java              |   4 +-
 .../spring/KeyStoreParametersFactoryBeanTest.java  |   2 +-
 .../SSLContextParametersFactoryBeanTest.java       |   2 +-
 .../SecureRandomParametersFactoryBeanTest.java     |   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 +-
 .../java/org/apache/camel/spring/package-info.java |   4 +-
 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                      |   6 +-
 .../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 +-
 .../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 +-
 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              |   9 +-
 .../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                    |   6 +-
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../org/apache/camel/component/syslog/syslog.json  |   2 +-
 .../camel/component/syslog/SyslogConverter.java    |   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       |   4 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/test-cdi-junit5.json   |   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 +-
 components/camel-test/camel-test-cdi/pom.xml       |   4 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/test-cdi.json          |   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 +-
 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    |   4 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../generated/resources/test-spring-junit5.json    |   2 +-
 components/camel-test/camel-test-spring/pom.xml    |   4 +-
 .../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                      |   6 +-
 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 +-
 .../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 +-
 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                    |   3 +-
 .../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 +-
 .../security/SpringSecurityConfiguration.java      |   2 +-
 .../spring/security/SpringSecurityProvider.java    |   8 +-
 .../AbstractSpringSecurityBearerTokenTest.java     |   2 +-
 .../component/spring/security/MockFilter.java      |  12 +-
 components/camel-undertow/pom.xml                  |  13 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../apache/camel/component/undertow/undertow.json  |   2 +-
 .../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 +-
 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         |  19 +-
 .../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          |  16 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/websocket/jsr356/websocket-jsr356.json   |   4 +-
 .../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 +-
 components/camel-websocket/pom.xml                 |  19 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/websocket/websocket.json       |   2 +-
 .../component/websocket/WebsocketComponent.java    |   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                 |   9 +-
 .../services/org/apache/camel/component.properties |   2 +-
 .../camel/component/wordpress/wordpress.json       |   2 +-
 .../impl/AbstractWordpressServiceAdapter.java      |   4 +-
 .../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 +-
 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                |   5 +-
 .../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                   |   5 +-
 .../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          |   7 +-
 .../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                                 |  68 +-
 core/camel-api/pom.xml                             |  10 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 core/camel-api/src/generated/resources/api.json    |   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 +-
 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 +-
 .../dsl/DynamicRouterComponentBuilderFactory.java  |   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                     |  30 +-
 .../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                      |  16 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/core-model.json        |   2 +-
 .../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 +-
 core/camel-core-processor/pom.xml                  |  16 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/core-processor.json    |   2 +-
 core/camel-core-reifier/pom.xml                    |  16 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/core-reifier.json      |   2 +-
 core/camel-core-xml/pom.xml                        |   6 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/core-xml.json          |   2 +-
 .../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 +-
 core/camel-core/pom.xml                            |  27 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 core/camel-core/src/generated/resources/core.json  |   2 +-
 .../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 +-
 .../dsl/DynamicRouterEndpointBuilderFactory.java   |   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                        |  17 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/xml-jaxb.json          |   2 +-
 .../xml/jaxb/DefaultModelJAXBContextFactory.java   |   4 +-
 .../java/org/apache/camel/xml/jaxb/JaxbHelper.java |   8 +-
 .../camel/xml/jaxb/JaxbModelToXMLDumper.java       |   4 +-
 core/camel-xml-jaxp/pom.xml                        |   2 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/xml-jaxp.json          |   2 +-
 core/pom.xml                                       |  53 +-
 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 +-
 .../component/ComponentsBuilderFactory.java        |   2 +-
 .../dsl/ActivemqComponentBuilderFactory.java       |  26 +-
 .../component/dsl/AmqpComponentBuilderFactory.java |  26 +-
 .../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  |  32 +-
 .../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 |  14 +-
 .../dsl/ImapsComponentBuilderFactory.java          |  14 +-
 .../dsl/InfinispanComponentBuilderFactory.java     |   2 +-
 .../InfinispanEmbeddedComponentBuilderFactory.java |   2 +-
 .../dsl/Influxdb2ComponentBuilderFactory.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  |  26 +-
 .../component/dsl/JmxComponentBuilderFactory.java  |   2 +-
 .../component/dsl/JoltComponentBuilderFactory.java |   2 +-
 .../component/dsl/JooqComponentBuilderFactory.java |   2 +-
 .../component/dsl/JpaComponentBuilderFactory.java  |   8 +-
 .../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 |  14 +-
 .../dsl/Pop3sComponentBuilderFactory.java          |  14 +-
 .../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 +-
 .../dsl/RocketmqComponentBuilderFactory.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          |  16 +-
 .../component/dsl/SjmsComponentBuilderFactory.java |  16 +-
 .../dsl/SlackComponentBuilderFactory.java          |   2 +-
 .../component/dsl/SmppComponentBuilderFactory.java |   2 +-
 .../dsl/SmppsComponentBuilderFactory.java          |   2 +-
 .../component/dsl/SmtpComponentBuilderFactory.java |  14 +-
 .../dsl/SmtpsComponentBuilderFactory.java          |  14 +-
 .../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 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/componentdsl.json      |   2 +-
 .../src/generated/resources/metadata.json          | 704 ++++++++++-----------
 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                      |   6 +-
 .../builder/endpoint/EndpointBuilderFactory.java   |   2 +-
 .../camel/builder/endpoint/EndpointBuilders.java   |   2 +-
 .../builder/endpoint/StaticEndpointBuilders.java   |   2 +-
 .../endpoint/dsl/AMQPEndpointBuilderFactory.java   | 108 ++--
 .../endpoint/dsl/AS2EndpointBuilderFactory.java    |   2 +-
 .../dsl/AWS2EC2EndpointBuilderFactory.java         |   2 +-
 .../endpoint/dsl/AWS2S3EndpointBuilderFactory.java |   2 +-
 .../dsl/ActiveMQEndpointBuilderFactory.java        | 108 ++--
 .../dsl/ArangoDbEndpointBuilderFactory.java        |   2 +-
 .../dsl/AsteriskEndpointBuilderFactory.java        |   2 +-
 .../dsl/Athena2EndpointBuilderFactory.java         |   2 +-
 .../dsl/AtlasMapEndpointBuilderFactory.java        |   2 +-
 .../endpoint/dsl/AtmosEndpointBuilderFactory.java  |   2 +-
 .../AtmosphereWebsocketEndpointBuilderFactory.java |   6 +-
 .../endpoint/dsl/AtomEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/AvroEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/BeanEndpointBuilderFactory.java   |   2 +-
 .../dsl/BeanValidatorEndpointBuilderFactory.java   |  34 +-
 .../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/InfluxDb2EndpointBuilderFactory.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 |   4 +-
 .../dsl/JcloudsEndpointBuilderFactory.java         |   2 +-
 .../endpoint/dsl/JcrEndpointBuilderFactory.java    |   2 +-
 .../endpoint/dsl/JdbcEndpointBuilderFactory.java   |   2 +-
 .../dsl/JettyHttpEndpointBuilderFactory.java       |  18 +-
 .../endpoint/dsl/JiraEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/JmsEndpointBuilderFactory.java    | 108 ++--
 .../endpoint/dsl/JoltEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/JooqEndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/JpaEndpointBuilderFactory.java    |  10 +-
 .../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   |  40 +-
 .../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        |   6 +-
 .../dsl/RobotFrameworkEndpointBuilderFactory.java  |   2 +-
 .../dsl/RocketMQEndpointBuilderFactory.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         |   6 +-
 .../endpoint/dsl/Ses2EndpointBuilderFactory.java   |   2 +-
 .../endpoint/dsl/SftpEndpointBuilderFactory.java   |   2 +-
 .../SimpleNotificationEndpointBuilderFactory.java  |   2 +-
 .../endpoint/dsl/Sjms2EndpointBuilderFactory.java  |  78 +--
 .../endpoint/dsl/SjmsEndpointBuilderFactory.java   |  78 +--
 .../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 +-
 .../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 +-
 .../apache/camel/dsl/java/joor/MultiCompile.java   |   4 +-
 dsl/camel-jbang/camel-jbang-core/pom.xml           |   8 +-
 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                     |   4 +-
 .../services/org/apache/camel/other.properties     |   2 +-
 .../src/generated/resources/kamelet-main.json      |   2 +-
 .../main/download/MavenDependencyDownloader.java   |   2 +-
 .../injection/AnnotationDependencyInjection.java   |  10 +-
 .../apache/camel/main/injection/DIRegistry.java    |   8 +-
 .../camel/main/injection/DIRegistryTest.java       |   4 +-
 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            |  10 +-
 .../cdi/RouteDefinitionsFromXmlTest.java           |   4 +-
 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            |   6 +-
 .../maven/dsl/yaml/GenerateYamlSupportMojo.java    |  20 +-
 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                                        |  51 +-
 etc/pom.xml                                        |   4 +-
 init/camel-bundle-plugin/pom.xml                   |   2 +-
 init/pom.xml                                       |   2 +-
 jakarta/rewrite.java                               |   2 +-
 parent/pom.xml                                     | 215 +++----
 pom.xml                                            |  16 +-
 test-infra/camel-test-infra-activemq/pom.xml       |   2 +-
 .../activemq/common/ConnectionFactoryHelper.java   |   2 +-
 .../services/AbstractActiveMQEmbeddedService.java  |   2 +-
 .../activemq/services/ConnectionFactoryAware.java  |   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 +-
 .../infra/jetty/services/JettyConfiguration.java   |   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                                 |   4 +-
 tests/camel-itest-cdi/pom.xml                      |  10 +-
 .../java/org/apache/camel/itest/cdi/MyRoutes.java  |   4 +-
 .../org/apache/camel/itest/cdi/CamelCdiTest.java   |   2 +-
 .../itest/cdi/PropertiesConfigurationTest.java     |   8 +-
 tests/camel-itest-jms2/pom.xml                     |   6 +-
 .../camel/itest/jms2/BaseJms2TestSupport.java      |  12 +-
 tests/camel-itest-standalone/pom.xml               |   2 +-
 tests/camel-itest/pom.xml                          |  46 +-
 .../org/apache/camel/itest/CamelJmsTestHelper.java |  55 +-
 .../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 +-
 tests/camel-partial-classpath-test/pom.xml         |   2 +-
 tests/camel-typeconverterscan-test/pom.xml         |   2 +-
 tests/pom.xml                                      |  19 +-
 .../camel-validator-test-resources/pom.xml         |   2 +-
 tests/test-bundles/mock-javamail_1.7/pom.xml       |  15 +-
 .../jvnet/mock_javamail/provider/IMAPProvider.java |   2 +-
 .../jvnet/mock_javamail/provider/POP3Provider.java |   2 +-
 .../jvnet/mock_javamail/provider/SMTPProvider.java |   2 +-
 tests/test-bundles/pom.xml                         |  34 +-
 tooling/camel-tooling-model/pom.xml                |  56 +-
 tooling/camel-tooling-util/pom.xml                 |  56 +-
 tooling/camel-util-json/pom.xml                    |  56 +-
 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   |   8 +-
 .../camel/maven/packaging/EndpointDslMojo.java     |   2 +-
 .../packaging/ModelXmlParserGeneratorMojo.java     |  28 +-
 .../camel/maven/packaging/PackageJaxbMojo.java     |   6 +-
 .../camel/maven/packaging/SchemaGeneratorMojo.java |  14 +-
 .../ComponentDslBuilderFactoryGenerator.java       |   2 +-
 .../ComponentsBuilderFactoryGenerator.java         |   2 +-
 .../ComponentDslBuilderFactoryGeneratorTest.java   |   2 +-
 tooling/maven/camel-resources-plugin/pom.xml       |   2 +-
 tooling/maven/camel-restdsl-openapi-plugin/pom.xml |   8 +-
 .../src/it/simple-dto-v3/pom.xml                   |   6 +-
 .../src/it/simple-dto/pom.xml                      |   6 +-
 .../src/it/simple-xml-dto-v3/pom.xml               |   8 +-
 .../src/it/simple-xml-dto/pom.xml                  |   8 +-
 .../src/it/simple-xml-v3/pom.xml                   |   2 +-
 .../src/it/simple-xml/pom.xml                      |   2 +-
 .../src/it/simple-yaml-dto-v3/pom.xml              |   8 +-
 .../src/it/simple-yaml-kamelet-v3/pom.xml          |   2 +-
 .../src/it/simple-yaml-v3/pom.xml                  |   2 +-
 tooling/maven/camel-restdsl-swagger-plugin/pom.xml |   8 +-
 .../src/it/simple-dto/pom.xml                      |   6 +-
 .../src/it/simple-xml-dto/pom.xml                  |   8 +-
 .../src/it/simple-xml/pom.xml                      |   2 +-
 tooling/maven/pom.xml                              |  17 +-
 tooling/maven/sync-properties-maven-plugin/pom.xml |   2 +-
 tooling/openapi-rest-dsl-generator/pom.xml         |  58 +-
 .../openapi/RestDslSourceCodeGenerator.java        |   2 +-
 .../SpringBootProjectSourceCodeGenerator.java      |   6 +-
 .../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 +-
 tooling/parent/pom.xml                             |   2 +-
 tooling/pom.xml                                    |   3 +-
 tooling/spi-annotations/pom.xml                    |  57 +-
 tooling/swagger-rest-dsl-generator/pom.xml         |  58 +-
 .../swagger/RestDslSourceCodeGenerator.java        |   2 +-
 .../SpringBootProjectSourceCodeGenerator.java      |   6 +-
 .../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 +-
 4232 files changed, 8844 insertions(+), 10547 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-cdi/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml
index dc092b4431a..152fb4bf636 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
@@ -31,7 +31,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <deltaspike-version>1.9.0</deltaspike-version>
-    <weld3-version>3.0.5.Final</weld3-version>
+    <weld-version>5.1.0.Final</weld-version>
     <log4j2-version>2.13.3</log4j2-version>
     <cdi-api-version>2.0</cdi-api-version>
   </properties>
@@ -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>
@@ -125,7 +125,7 @@
           <dependency>
             <groupId>org.jboss.weld.se</groupId>
             <artifactId>weld-se-shaded</artifactId>
-            <version>${weld3-version}</version>
+            <version>${weld-version}</version>
           </dependency>
         </dependencies>
       </plugin>
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/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 b6858c72ff7..58741c9b2ab 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>
@@ -51,11 +51,6 @@
         <artifactId>camel-vertx-kafka-maven-plugin</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-activemq</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-amqp</artifactId>
@@ -1191,11 +1186,6 @@
         <artifactId>camel-jmx</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-johnzon</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-jolt</artifactId>
@@ -1916,11 +1906,6 @@
         <artifactId>camel-stitch</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-stomp</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-stream</artifactId>
@@ -1971,11 +1956,6 @@
         <artifactId>camel-test</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-test-cdi</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-test-cdi-junit5</artifactId>
@@ -1991,11 +1971,6 @@
         <artifactId>camel-test-main-junit5</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-test-spring</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-test-spring-junit5</artifactId>
@@ -2131,11 +2106,6 @@
         <artifactId>camel-webhook</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-websocket</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-websocket-jsr356</artifactId>
diff --git a/bom/pom.xml b/bom/pom.xml
index 95c10cce0f0..f7afd7ee594 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>
 
@@ -38,7 +38,6 @@
     </modules>
 
     <properties>
-        <camel.osgi.export.pkg />
     </properties>
 
     <build>
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/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/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 1fc9ec368a7..13944449dcc 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>
@@ -59,8 +59,7 @@
     <atlasmap-version>2.5.2</atlasmap-version>
     <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>
+    <atmosphere-version>3.0.2</atmosphere-version>
     <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>
@@ -113,15 +95,15 @@
     <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>
     <classgraph-version>4.8.151</classgraph-version>
     <cmis-version>1.1.0</cmis-version>
     <cobertura-maven-plugin-version>2.7</cobertura-maven-plugin-version>
-    <cometd-java-client-version>4.0.4</cometd-java-client-version>
-    <cometd-java-server>4.0.4</cometd-java-server>
+    <cometd-java-client-version>7.0.9</cometd-java-client-version>
+    <cometd-java-server-version>7.0.9</cometd-java-server-version>
     <commons-beanutils-version>1.9.4</commons-beanutils-version>
     <commons-cli-version>1.4</commons-cli-version>
     <commons-codec-version>1.15</commons-codec-version>
@@ -149,11 +131,10 @@
     <corda-version>4.9.3</corda-version>
     <couchbase-client-version>3.3.4</couchbase-client-version>
     <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-plugin-version>4.0.0-SNAPSHOT</cxf-codegen-plugin-version>
+    <cxf-version>4.0.0-SNAPSHOT</cxf-version>
+    <cxf-xjc-plugin-version>4.0.0</cxf-xjc-plugin-version>
+    <cxf-xjc-utils-version>4.0.0</cxf-xjc-utils-version>
     <cxf.codegen.jvmArgs></cxf.codegen.jvmArgs>
     <cxf.codegenplugin.forkmode>true</cxf.codegenplugin.forkmode>
     <cxf.xjc.jvmArgs></cxf.xjc.jvmArgs>
@@ -203,15 +184,14 @@
     <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>
-    <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>
-    <geronimo-ws-metadata-spec-version>1.1.3</geronimo-ws-metadata-spec-version>
+    <jakarta-jms-api-version>3.1.0</jakarta-jms-api-version>
+    <jakarta-persistence-api-version>3.1.0</jakarta-persistence-api-version>
+    <jakarta-json-api-version>2.1.1</jakarta-json-api-version>
+    <jakarta-json-bind-api-version>3.0.0</jakarta-json-bind-api-version>
+    <jakarta-transaction-api-version>2.0.1</jakarta-transaction-api-version>
+    <jakarta-jws-api-version>3.0.0</jakarta-jws-api-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>
@@ -251,7 +231,7 @@
     <hazelcast-version>5.2.1</hazelcast-version>
     <hbase-version>2.5.0</hbase-version>
     <hdrhistrogram-version>2.1.11</hdrhistrogram-version>
-    <hibernate-validator-version>6.2.5.Final</hibernate-validator-version>
+    <hibernate-validator-version>8.0.0.Final</hibernate-validator-version>
     <hibernate-version>5.6.14.Final</hibernate-version>
     <hk2-version>2.6.1</hk2-version>
     <hsqldb-version>2.7.1</hsqldb-version>
@@ -278,9 +258,9 @@
     <jackson2-module-scala-version>2.14.0</jackson2-module-scala-version>
     <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-enterprise-cdi-api-version>4.0.1</jakarta-enterprise-cdi-api-version>
+    <jakarta-xml-bind-api-version>4.0.0</jakarta-xml-bind-api-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>
@@ -293,16 +273,15 @@
     <javaparser-version>3.13.10</javaparser-version>
     <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>
+    <jakarta-activation-version>2.0.1</jakarta-activation-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>
-    <jaxws-api-version>2.3.0</jaxws-api-version>
+    <jakarta-servlet-api-version>6.0.0</jakarta-servlet-api-version>
+    <jakarta-xml-soap-api-version>3.0.0</jakarta-xml-soap-api-version>
+    <jaxb2-maven-plugin-version>3.1.0</jaxb2-maven-plugin-version>
+    <jakarta-xml-ws-api-version>4.0.0</jakarta-xml-ws-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>
     <jboss-marshalling-version>1.4.10.Final</jboss-marshalling-version>
@@ -311,7 +290,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>
@@ -322,8 +300,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>
@@ -380,7 +357,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>
@@ -417,7 +393,7 @@
     <minidns-version>0.3.4</minidns-version>
     <minimal-json-version>0.9.5</minimal-json-version>
     <minio-version>8.4.6</minio-version>
-    <mock-javamail-version>1.9</mock-javamail-version>
+    <mock-javamail-version>2.0</mock-javamail-version>
     <mockito-version>3.12.4</mockito-version>
     <mockwebserver-version>0.2.2</mockwebserver-version>
     <mongo-hadoop-version>1.5.0</mongo-hadoop-version>
@@ -465,7 +441,7 @@
     <pubnub-version>4.25.0</pubnub-version>
     <pulsar-version>2.10.2</pulsar-version>
     <qpid-broker-version>8.0.6</qpid-broker-version>
-    <qpid-jms-client-version>1.7.0</qpid-jms-client-version>
+    <qpid-jms-client-version>2.1.0</qpid-jms-client-version>
     <qpid-proton-j-version>0.34.0</qpid-proton-j-version>
     <quartz-version>2.3.2</quartz-version>
     <quickfixj-version>2.3.1</quickfixj-version>
@@ -478,7 +454,7 @@
     <redisson-version>3.16.7</redisson-version>
     <resilience4j-version>1.7.1</resilience4j-version>
     <rest-assured-version>4.5.1</rest-assured-version>
-    <resteasy-version>4.5.6.Final</resteasy-version>
+    <resteasy-version>6.2.1.Final</resteasy-version>
     <roaster-version>2.26.0.Final</roaster-version>
     <robotframework-version>4.1.2</robotframework-version>
     <rocketmq-version>4.9.4</rocketmq-version>
@@ -488,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.10.1</shiro-version>
     <shrinkwrap-descriptors-version>2.0.0</shrinkwrap-descriptors-version>
     <shrinkwrap-maven-version>3.6.3</shrinkwrap-maven-version>
@@ -506,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>
@@ -518,10 +492,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-range>[5,6)</spring-version-range>
-    <spring-ws-version>3.1.4</spring-ws-version>
-    <spring5-version>5.3.24</spring5-version>
+    <spring-version>6.0.2</spring-version>
+    <spring-ws-version>4.0.0</spring-ws-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>
@@ -539,7 +511,7 @@
     <trimStackTrace>false</trimStackTrace>
     <twilio-version>7.55.3</twilio-version>
     <twitter4j-version>4.0.7</twitter4j-version>
-    <undertow-version>2.2.21.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>
@@ -549,7 +521,7 @@
     <vysper-version>0.7</vysper-version>
     <web3j-quorum-version>0.8.0</web3j-quorum-version>
     <web3j-version>3.6.0</web3j-version>
-    <weld3-version>3.1.8.Final</weld3-version>
+    <weld-version>5.1.0.Final</weld-version>
     <wildfly-elytron>1.15.4.Final</wildfly-elytron>
     <wiremock-version>2.32.0</wiremock-version>
     <woodstox-core-version>6.3.1</woodstox-core-version>
diff --git a/catalog/camel-allcomponents/pom.xml b/catalog/camel-allcomponents/pom.xml
index 40e2c4092fa..ec8285da14a 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>
@@ -33,11 +33,6 @@
     <description>Depends on all components to ensure correct build ordering</description>
 
 	<dependencies>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-activemq</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-amqp</artifactId>
@@ -1013,11 +1008,6 @@
             <artifactId>camel-jmx</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-johnzon</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-jolt</artifactId>
@@ -1698,11 +1688,6 @@
             <artifactId>camel-stitch</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-stomp</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-stream</artifactId>
@@ -1748,11 +1733,6 @@
             <artifactId>camel-test</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-cdi</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-cdi-junit5</artifactId>
@@ -1768,11 +1748,6 @@
             <artifactId>camel-test-main-junit5</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-spring</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-test-spring-junit5</artifactId>
@@ -1888,11 +1863,6 @@
             <artifactId>camel-webhook</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-websocket</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-websocket-jsr356</artifactId>
diff --git a/catalog/camel-catalog-console/pom.xml b/catalog/camel-catalog-console/pom.xml
index 739641bf21c..570b4bbc905 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>
@@ -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 7ec9d5ad6c1..3b8ea6e580f 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>
@@ -84,10 +84,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 
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 0956ba1e99f..b4cac19d4b4 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>
@@ -112,12 +112,6 @@
         </dependency>
 
         <!-- for testing activemq component -->
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-activemq</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</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..60c5f806730 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",
@@ -24,10 +24,10 @@
   "componentProperties": {
     "brokerURL": { "kind": "property", "displayName": "Broker URL", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Sets the broker URL to use to connect to ActiveMQ. If none configured then localhost:61616 is used by default (however can be overridden by configuration from environment variables)" },
     "clientId": { "kind": "property", "displayName": "Client Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets the JMS client ID to use. Note that this value, if specified, must be unique and can only be used by a single JMS connection instance. [...]
-    "connectionFactory": { "kind": "property", "displayName": "Connection Factory", "group": "common", "label": "", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The connection factory to be use. A connection factory must be configured either on the component or endpoint." },
+    "connectionFactory": { "kind": "property", "displayName": "Connection Factory", "group": "common", "label": "", "required": false, "type": "object", "javaType": "jakarta.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The connection factory to be use. A connection factory must be configured either on the component or endpoint." },
     "disableReplyTo": { "kind": "property", "displayName": "Disable Reply To", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to [...]
     "durableSubscriptionName": { "kind": "property", "displayName": "Durable Subscription Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The durable subscriber name for specifying durable topic subscriptions. The clientId option must be configur [...]
-    "jmsMessageType": { "kind": "property", "displayName": "Jms Message Type", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.JmsMessageType", "enum": [ "Bytes", "Map", "Object", "Stream", "Text" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows you to force the use of a specific [...]
+    "jmsMessageType": { "kind": "property", "displayName": "Jms Message Type", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.JmsMessageType", "enum": [ "Bytes", "Map", "Object", "Stream", "Text" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows you to force the use of a specific [...]
     "replyTo": { "kind": "property", "displayName": "Reply To", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer)." },
     "testConnectionOnStartup": { "kind": "property", "displayName": "Test Connection On Startup", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether to test the connection on startup. This ensures that when Camel starts tha [...]
     "usePooledConnection": { "kind": "property", "displayName": "Use Pooled Connection", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "description": "Enables or disables whether a PooledConnectionFactory will be used so that when messages are sent to ActiveMQ from outside of a message consuming thread, pooling will be used rather tha [...]
@@ -56,7 +56,7 @@
     "replyToSameDestinationAllowed": { "kind": "property", "displayName": "Reply To Same Destination Allowed", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Whether a JMS consumer is allowed to send a reply [...]
     "taskExecutor": { "kind": "property", "displayName": "Task Executor", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.springframework.core.task.TaskExecutor", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows you to specify a custom task executor for consuming messages." },
     "deliveryDelay": { "kind": "property", "displayName": "Delivery Delay", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": -1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets delivery delay to use for send calls for JMS. This option requires JMS 2.0 compliant broker." },
-    "deliveryMode": { "kind": "property", "displayName": "Delivery Mode", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "enum": [ "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMo [...]
+    "deliveryMode": { "kind": "property", "displayName": "Delivery Mode", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "enum": [ "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the delivery mode to be used. Possible values are those defined by jakarta.jms.Delivery [...]
     "deliveryPersistent": { "kind": "property", "displayName": "Delivery Persistent", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether persistent delivery is used by default." },
     "explicitQosEnabled": { "kind": "property", "displayName": "Explicit Qos Enabled", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Set if the deliveryMode, priority or timeToLive qualities of service should be us [...]
     "formatDateHeadersToIso8601": { "kind": "property", "displayName": "Format Date Headers To Iso8601", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets whether JMS date properties should be formatted according to the ISO 8 [...]
@@ -90,15 +90,15 @@
     "configuration": { "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.JmsConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "To use a shared JMS configuration" },
     "destinationResolver": { "kind": "property", "displayName": "Destination Resolver", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.springframework.jms.support.destination.DestinationResolver", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "A pluggable org.springframework.jms.support.destination.Dest [...]
     "errorHandler": { "kind": "property", "displayName": "Error Handler", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.springframework.util.ErrorHandler", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions t [...]
-    "exceptionListener": { "kind": "property", "displayName": "Exception Listener", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ExceptionListener", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions." },
+    "exceptionListener": { "kind": "property", "displayName": "Exception Listener", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.jms.ExceptionListener", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions." },
     "idleConsumerLimit": { "kind": "property", "displayName": "Idle Consumer Limit", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specify the limit for the number of consumers that are allowed to be idle at any given time." },
     "idleTaskExecutionLimit": { "kind": "property", "displayName": "Idle Task Execution Limit", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the limit for idle executions of a receive task, not having received any message w [...]
     "includeAllJMSXProperties": { "kind": "property", "displayName": "Include All JMSXProperties", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Whether to include all JMSXxxx properties when mapping from JMS to Camel Message. [...]
     "jmsKeyFormatStrategy": { "kind": "property", "displayName": "Jms Key Format Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.JmsKeyFormatStrategy", "enum": [ "default", "passthrough" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Pluggable strategy for encodin [...]
-    "mapJmsMessage": { "kind": "property", "displayName": "Map Jms Message", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should auto map the received JMS message to a suited payload type, such as javax [...]
+    "mapJmsMessage": { "kind": "property", "displayName": "Map Jms Message", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should auto map the received JMS message to a suited payload type, such as jakar [...]
     "maxMessagesPerTask": { "kind": "property", "displayName": "Max Messages Per Task", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": -1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The number of messages per task. -1 is unlimited. If you use a range for concurrent consumers (eg m [...]
-    "messageConverter": { "kind": "property", "displayName": "Message Converter", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.springframework.jms.support.converter.MessageConverter", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "To use a custom Spring org.springframework.jms.support.converter.Messag [...]
-    "messageCreatedStrategy": { "kind": "property", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "To use the given MessageCreatedStrategy which are invoked when  [...]
+    "messageConverter": { "kind": "property", "displayName": "Message Converter", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.springframework.jms.support.converter.MessageConverter", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "To use a custom Spring org.springframework.jms.support.converter.Messag [...]
+    "messageCreatedStrategy": { "kind": "property", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "To use the given MessageCreatedStrategy which are invoked when  [...]
     "messageIdEnabled": { "kind": "property", "displayName": "Message Id Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "When sending, specifies whether message IDs should be added. This is just an hint to the JMS broke [...]
     "messageListenerContainerFactory": { "kind": "property", "displayName": "Message Listener Container Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.MessageListenerContainerFactory", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Registry ID of the MessageListenerC [...]
     "messageTimestampEnabled": { "kind": "property", "displayName": "Message Timestamp Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether timestamps should be enabled by default on sending messages. This  [...]
@@ -108,7 +108,7 @@
     "recoveryInterval": { "kind": "property", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in mil [...]
     "requestTimeoutCheckerInterval": { "kind": "property", "displayName": "Request Timeout Checker Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1000", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Configures how often Camel should check for timed out Exchanges when do [...]
     "synchronous": { "kind": "property", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets whether synchronous processing should be strictly used" },
-    "transferException": { "kind": "property", "displayName": "Transfer Exception", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consu [...]
+    "transferException": { "kind": "property", "displayName": "Transfer Exception", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consu [...]
     "transferExchange": { "kind": "property", "displayName": "Transfer Exchange", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "You can transfer the exchange over the wire instead of just the body and headers. The following fi [...]
     "trustAllPackages": { "kind": "property", "displayName": "Trust All Packages", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "description": "Define if all Java packages are trusted or not (for Java object JMS message types). Notice its not recommended practice to send Java serialized objects over network. Setting this to true [...]
     "useMessageIDAsCorrelationID": { "kind": "property", "displayName": "Use Message IDAs Correlation ID", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether JMSMessageID should always be used as JMSCorrelationID  [...]
@@ -127,19 +127,19 @@
     "transactionTimeout": { "kind": "property", "displayName": "Transaction Timeout", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": -1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The timeout value of the transaction (in seconds), if using transacted mode." }
   },
   "headers": {
-    "CamelJmsDestination": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "javax.jms.Destination", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The destination.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_DESTINATION" },
+    "CamelJmsDestination": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "jakarta.jms.Destination", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The destination.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_DESTINATION" },
     "CamelJmsDestinationName": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The name of the queue or topic to use as destination.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_DESTINATION_NAME" },
     "JMSXGroupID": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS group ID.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_X_GROUP_ID" },
     "JMSMessageID": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS unique message ID.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_MESSAGE_ID" },
     "JMSCorrelationID": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS correlation ID.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_CORRELATION_ID" },
     "JMSCorrelationIDAsBytes": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS correlation ID as bytes.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_CORRELATION_ID_AS_BYTES" },
     "JMSDeliveryMode": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "int", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS delivery mode.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_DELIVERY_MODE" },
-    "JMSDestination": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "javax.jms.Destination", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS destination.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_DESTINATION" },
+    "JMSDestination": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "jakarta.jms.Destination", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS destination.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_DESTINATION" },
     "JMSExpiration": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "long", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS expiration.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_EXPIRATION" },
     "JMSPriority": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "int", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS priority (with 0 as the lowest priority and 9 as the highest).", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_PRIORITY" },
     "JMSRedelivered": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Is the JMS message redelivered.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_REDELIVERED" },
     "JMSTimestamp": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "long", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS timestamp.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_TIMESTAMP" },
-    "JMSReplyTo": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "javax.jms.Destination", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS reply-to destination.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_REPLY_TO" },
+    "JMSReplyTo": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "jakarta.jms.Destination", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS reply-to destination.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_REPLY_TO" },
     "JMSType": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS type.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_TYPE" },
     "JMSXUserID": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The XUser id.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_XUSER_ID" },
     "CamelJmsMessageType": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "org.apache.camel.component.jms.JmsMessageType", "enum": [ "Bytes", "Map", "Object", "Stream", "Text", "Blob" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The message type.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_MESSAGE_TYPE" },
@@ -149,10 +149,10 @@
     "destinationType": { "kind": "path", "displayName": "Destination Type", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "queue", "topic", "temp-queue", "temp-topic" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "queue", "description": "The kind of destination to use" },
     "destinationName": { "kind": "path", "displayName": "Destination Name", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Name of the queue or topic to use as destination" },
     "clientId": { "kind": "parameter", "displayName": "Client Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets the JMS client ID to use. Note that this value, if specified, must be unique and can only be used by a single JMS connection instance [...]
-    "connectionFactory": { "kind": "parameter", "displayName": "Connection Factory", "group": "common", "label": "", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The connection factory to be use. A connection factory must be configured either on the component or endpoint." },
+    "connectionFactory": { "kind": "parameter", "displayName": "Connection Factory", "group": "common", "label": "", "required": false, "type": "object", "javaType": "jakarta.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The connection factory to be use. A connection factory must be configured either on the component or endpoint." },
     "disableReplyTo": { "kind": "parameter", "displayName": "Disable Reply To", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back t [...]
     "durableSubscriptionName": { "kind": "parameter", "displayName": "Durable Subscription Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The durable subscriber name for specifying durable topic subscriptions. The clientId option must be configu [...]
-    "jmsMessageType": { "kind": "parameter", "displayName": "Jms Message Type", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.JmsMessageType", "enum": [ "Bytes", "Map", "Object", "Stream", "Text" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows you to force the use of a specifi [...]
+    "jmsMessageType": { "kind": "parameter", "displayName": "Jms Message Type", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.JmsMessageType", "enum": [ "Bytes", "Map", "Object", "Stream", "Text" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows you to force the use of a specifi [...]
     "replyTo": { "kind": "parameter", "displayName": "Reply To", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer)." },
     "testConnectionOnStartup": { "kind": "parameter", "displayName": "Test Connection On Startup", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether to test the connection on startup. This ensures that when Camel starts th [...]
     "acknowledgementModeName": { "kind": "parameter", "displayName": "Acknowledgement Mode Name", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "SESSION_TRANSACTED", "CLIENT_ACKNOWLEDGE", "AUTO_ACKNOWLEDGE", "DUPS_OK_ACKNOWLEDGE" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "AUTO_ACKNOWLEDGE", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationFie [...]
@@ -182,7 +182,7 @@
     "replyToSameDestinationAllowed": { "kind": "parameter", "displayName": "Reply To Same Destination Allowed", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Whether a JMS consumer is allowed to send a repl [...]
     "taskExecutor": { "kind": "parameter", "displayName": "Task Executor", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.springframework.core.task.TaskExecutor", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows you to specify a custom task executor for consuming messages." },
     "deliveryDelay": { "kind": "parameter", "displayName": "Delivery Delay", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": -1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets delivery delay to use for send calls for JMS. This option requires JMS 2.0 compliant broker." },
-    "deliveryMode": { "kind": "parameter", "displayName": "Delivery Mode", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "enum": [ "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryM [...]
+    "deliveryMode": { "kind": "parameter", "displayName": "Delivery Mode", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "enum": [ "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the delivery mode to be used. Possible values are those defined by jakarta.jms.Deliver [...]
     "deliveryPersistent": { "kind": "parameter", "displayName": "Delivery Persistent", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether persistent delivery is used by default." },
     "explicitQosEnabled": { "kind": "parameter", "displayName": "Explicit Qos Enabled", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Set if the deliveryMode, priority or timeToLive qualities of service should be u [...]
     "formatDateHeadersToIso8601": { "kind": "parameter", "displayName": "Format Date Headers To Iso8601", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets whether JMS date properties should be formatted according to the ISO  [...]
@@ -212,16 +212,16 @@
     "asyncStopListener": { "kind": "parameter", "displayName": "Async Stop Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Whether to stop the JmsConsumer message listener asynchronously, when stopping a route." },
     "destinationResolver": { "kind": "parameter", "displayName": "Destination Resolver", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.springframework.jms.support.destination.DestinationResolver", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "A pluggable org.springframework.jms.support.destination.Des [...]
     "errorHandler": { "kind": "parameter", "displayName": "Error Handler", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.springframework.util.ErrorHandler", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions  [...]
-    "exceptionListener": { "kind": "parameter", "displayName": "Exception Listener", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ExceptionListener", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions." },
+    "exceptionListener": { "kind": "parameter", "displayName": "Exception Listener", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.jms.ExceptionListener", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions." },
     "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message." },
     "idleConsumerLimit": { "kind": "parameter", "displayName": "Idle Consumer Limit", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specify the limit for the number of consumers that are allowed to be idle at any given time." },
     "idleTaskExecutionLimit": { "kind": "parameter", "displayName": "Idle Task Execution Limit", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the limit for idle executions of a receive task, not having received any message  [...]
     "includeAllJMSXProperties": { "kind": "parameter", "displayName": "Include All JMSXProperties", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Whether to include all JMSXxxx properties when mapping from JMS to Camel Message [...]
     "jmsKeyFormatStrategy": { "kind": "parameter", "displayName": "Jms Key Format Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.JmsKeyFormatStrategy", "enum": [ "default", "passthrough" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Pluggable strategy for encodi [...]
-    "mapJmsMessage": { "kind": "parameter", "displayName": "Map Jms Message", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should auto map the received JMS message to a suited payload type, such as java [...]
+    "mapJmsMessage": { "kind": "parameter", "displayName": "Map Jms Message", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should auto map the received JMS message to a suited payload type, such as jaka [...]
     "maxMessagesPerTask": { "kind": "parameter", "displayName": "Max Messages Per Task", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": -1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The number of messages per task. -1 is unlimited. If you use a range for concurrent consumers (eg  [...]
-    "messageConverter": { "kind": "parameter", "displayName": "Message Converter", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.springframework.jms.support.converter.MessageConverter", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "To use a custom Spring org.springframework.jms.support.converter.Messa [...]
-    "messageCreatedStrategy": { "kind": "parameter", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "To use the given MessageCreatedStrategy which are invoked when [...]
+    "messageConverter": { "kind": "parameter", "displayName": "Message Converter", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.springframework.jms.support.converter.MessageConverter", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "To use a custom Spring org.springframework.jms.support.converter.Messa [...]
+    "messageCreatedStrategy": { "kind": "parameter", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "To use the given MessageCreatedStrategy which are invoked when [...]
     "messageIdEnabled": { "kind": "parameter", "displayName": "Message Id Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "When sending, specifies whether message IDs should be added. This is just an hint to the JMS brok [...]
     "messageListenerContainerFactory": { "kind": "parameter", "displayName": "Message Listener Container Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.MessageListenerContainerFactory", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Registry ID of the MessageListener [...]
     "messageTimestampEnabled": { "kind": "parameter", "displayName": "Message Timestamp Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether timestamps should be enabled by default on sending messages. This [...]
@@ -230,7 +230,7 @@
     "recoveryInterval": { "kind": "parameter", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in mi [...]
     "requestTimeoutCheckerInterval": { "kind": "parameter", "displayName": "Request Timeout Checker Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1000", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Configures how often Camel should check for timed out Exchanges when d [...]
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets whether synchronous processing should be strictly used" },
-    "transferException": { "kind": "parameter", "displayName": "Transfer Exception", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the cons [...]
+    "transferException": { "kind": "parameter", "displayName": "Transfer Exception", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the cons [...]
     "transferExchange": { "kind": "parameter", "displayName": "Transfer Exchange", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "You can transfer the exchange over the wire instead of just the body and headers. The following f [...]
     "useMessageIDAsCorrelationID": { "kind": "parameter", "displayName": "Use Message IDAs Correlation ID", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether JMSMessageID should always be used as JMSCorrelationID [...]
     "waitForProvisionCorrelationToBeUpdatedCounter": { "kind": "parameter", "displayName": "Wait For Provision Correlation To Be Updated Counter", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 50, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Number of times to wait for provisional  [...]
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..2f347b745de 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",
@@ -23,11 +23,11 @@
   },
   "componentProperties": {
     "clientId": { "kind": "property", "displayName": "Client Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets the JMS client ID to use. Note that this value, if specified, must be unique and can only be used by a single JMS connection instance. [...]
-    "connectionFactory": { "kind": "property", "displayName": "Connection Factory", "group": "common", "label": "", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The connection factory to be use. A connection factory must be configured either on the component or endpoint." },
+    "connectionFactory": { "kind": "property", "displayName": "Connection Factory", "group": "common", "label": "", "required": false, "type": "object", "javaType": "jakarta.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The connection factory to be use. A connection factory must be configured either on the component or endpoint." },
     "disableReplyTo": { "kind": "property", "displayName": "Disable Reply To", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to [...]
     "durableSubscriptionName": { "kind": "property", "displayName": "Durable Subscription Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The durable subscriber name for specifying durable topic subscriptions. The clientId option must be configur [...]
     "includeAmqpAnnotations": { "kind": "property", "displayName": "Include AMQP Annotations", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to include AMQP annotations when mapping from AMQP to Camel Message. Setting this to true maps AMQP message annotations that contain a JMS_AMQP_MA_ prefix to message headers. D [...]
-    "jmsMessageType": { "kind": "property", "displayName": "Jms Message Type", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.JmsMessageType", "enum": [ "Bytes", "Map", "Object", "Stream", "Text" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows you to force the use of a specific [...]
+    "jmsMessageType": { "kind": "property", "displayName": "Jms Message Type", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.JmsMessageType", "enum": [ "Bytes", "Map", "Object", "Stream", "Text" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows you to force the use of a specific [...]
     "replyTo": { "kind": "property", "displayName": "Reply To", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer)." },
     "testConnectionOnStartup": { "kind": "property", "displayName": "Test Connection On Startup", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether to test the connection on startup. This ensures that when Camel starts tha [...]
     "acknowledgementModeName": { "kind": "property", "displayName": "Acknowledgement Mode Name", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "SESSION_TRANSACTED", "CLIENT_ACKNOWLEDGE", "AUTO_ACKNOWLEDGE", "DUPS_OK_ACKNOWLEDGE" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "AUTO_ACKNOWLEDGE", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationFiel [...]
@@ -54,7 +54,7 @@
     "replyToSameDestinationAllowed": { "kind": "property", "displayName": "Reply To Same Destination Allowed", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Whether a JMS consumer is allowed to send a reply [...]
     "taskExecutor": { "kind": "property", "displayName": "Task Executor", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.springframework.core.task.TaskExecutor", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows you to specify a custom task executor for consuming messages." },
     "deliveryDelay": { "kind": "property", "displayName": "Delivery Delay", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": -1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets delivery delay to use for send calls for JMS. This option requires JMS 2.0 compliant broker." },
-    "deliveryMode": { "kind": "property", "displayName": "Delivery Mode", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "enum": [ "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMo [...]
+    "deliveryMode": { "kind": "property", "displayName": "Delivery Mode", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "enum": [ "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the delivery mode to be used. Possible values are those defined by jakarta.jms.Delivery [...]
     "deliveryPersistent": { "kind": "property", "displayName": "Delivery Persistent", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether persistent delivery is used by default." },
     "explicitQosEnabled": { "kind": "property", "displayName": "Explicit Qos Enabled", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Set if the deliveryMode, priority or timeToLive qualities of service should be us [...]
     "formatDateHeadersToIso8601": { "kind": "property", "displayName": "Format Date Headers To Iso8601", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets whether JMS date properties should be formatted according to the ISO 8 [...]
@@ -88,15 +88,15 @@
     "configuration": { "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.JmsConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "To use a shared JMS configuration" },
     "destinationResolver": { "kind": "property", "displayName": "Destination Resolver", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.springframework.jms.support.destination.DestinationResolver", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "A pluggable org.springframework.jms.support.destination.Dest [...]
     "errorHandler": { "kind": "property", "displayName": "Error Handler", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.springframework.util.ErrorHandler", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions t [...]
-    "exceptionListener": { "kind": "property", "displayName": "Exception Listener", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ExceptionListener", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions." },
+    "exceptionListener": { "kind": "property", "displayName": "Exception Listener", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.jms.ExceptionListener", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions." },
     "idleConsumerLimit": { "kind": "property", "displayName": "Idle Consumer Limit", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specify the limit for the number of consumers that are allowed to be idle at any given time." },
     "idleTaskExecutionLimit": { "kind": "property", "displayName": "Idle Task Execution Limit", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the limit for idle executions of a receive task, not having received any message w [...]
     "includeAllJMSXProperties": { "kind": "property", "displayName": "Include All JMSXProperties", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Whether to include all JMSXxxx properties when mapping from JMS to Camel Message. [...]
     "jmsKeyFormatStrategy": { "kind": "property", "displayName": "Jms Key Format Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.JmsKeyFormatStrategy", "enum": [ "default", "passthrough" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Pluggable strategy for encodin [...]
-    "mapJmsMessage": { "kind": "property", "displayName": "Map Jms Message", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should auto map the received JMS message to a suited payload type, such as javax [...]
+    "mapJmsMessage": { "kind": "property", "displayName": "Map Jms Message", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should auto map the received JMS message to a suited payload type, such as jakar [...]
     "maxMessagesPerTask": { "kind": "property", "displayName": "Max Messages Per Task", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": -1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The number of messages per task. -1 is unlimited. If you use a range for concurrent consumers (eg m [...]
-    "messageConverter": { "kind": "property", "displayName": "Message Converter", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.springframework.jms.support.converter.MessageConverter", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "To use a custom Spring org.springframework.jms.support.converter.Messag [...]
-    "messageCreatedStrategy": { "kind": "property", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "To use the given MessageCreatedStrategy which are invoked when  [...]
+    "messageConverter": { "kind": "property", "displayName": "Message Converter", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.springframework.jms.support.converter.MessageConverter", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "To use a custom Spring org.springframework.jms.support.converter.Messag [...]
+    "messageCreatedStrategy": { "kind": "property", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "To use the given MessageCreatedStrategy which are invoked when  [...]
     "messageIdEnabled": { "kind": "property", "displayName": "Message Id Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "When sending, specifies whether message IDs should be added. This is just an hint to the JMS broke [...]
     "messageListenerContainerFactory": { "kind": "property", "displayName": "Message Listener Container Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.MessageListenerContainerFactory", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Registry ID of the MessageListenerC [...]
     "messageTimestampEnabled": { "kind": "property", "displayName": "Message Timestamp Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether timestamps should be enabled by default on sending messages. This  [...]
@@ -106,7 +106,7 @@
     "recoveryInterval": { "kind": "property", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in mil [...]
     "requestTimeoutCheckerInterval": { "kind": "property", "displayName": "Request Timeout Checker Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1000", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Configures how often Camel should check for timed out Exchanges when do [...]
     "synchronous": { "kind": "property", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets whether synchronous processing should be strictly used" },
-    "transferException": { "kind": "property", "displayName": "Transfer Exception", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consu [...]
+    "transferException": { "kind": "property", "displayName": "Transfer Exception", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consu [...]
     "transferExchange": { "kind": "property", "displayName": "Transfer Exchange", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "You can transfer the exchange over the wire instead of just the body and headers. The following fi [...]
     "useMessageIDAsCorrelationID": { "kind": "property", "displayName": "Use Message IDAs Correlation ID", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether JMSMessageID should always be used as JMSCorrelationID  [...]
     "waitForProvisionCorrelationToBeUpdatedCounter": { "kind": "property", "displayName": "Wait For Provision Correlation To Be Updated Counter", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 50, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Number of times to wait for provisional c [...]
@@ -124,19 +124,19 @@
     "transactionTimeout": { "kind": "property", "displayName": "Transaction Timeout", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": -1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The timeout value of the transaction (in seconds), if using transacted mode." }
   },
   "headers": {
-    "CamelJmsDestination": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "javax.jms.Destination", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The destination.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_DESTINATION" },
+    "CamelJmsDestination": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "jakarta.jms.Destination", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The destination.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_DESTINATION" },
     "CamelJmsDestinationName": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The name of the queue or topic to use as destination.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_DESTINATION_NAME" },
     "JMSXGroupID": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS group ID.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_X_GROUP_ID" },
     "JMSMessageID": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS unique message ID.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_MESSAGE_ID" },
     "JMSCorrelationID": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS correlation ID.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_CORRELATION_ID" },
     "JMSCorrelationIDAsBytes": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS correlation ID as bytes.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_CORRELATION_ID_AS_BYTES" },
     "JMSDeliveryMode": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "int", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS delivery mode.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_DELIVERY_MODE" },
-    "JMSDestination": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "javax.jms.Destination", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS destination.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_DESTINATION" },
+    "JMSDestination": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "jakarta.jms.Destination", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS destination.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_DESTINATION" },
     "JMSExpiration": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "long", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS expiration.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_EXPIRATION" },
     "JMSPriority": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "int", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS priority (with 0 as the lowest priority and 9 as the highest).", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_PRIORITY" },
     "JMSRedelivered": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Is the JMS message redelivered.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_REDELIVERED" },
     "JMSTimestamp": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "long", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS timestamp.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_TIMESTAMP" },
-    "JMSReplyTo": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "javax.jms.Destination", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS reply-to destination.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_REPLY_TO" },
+    "JMSReplyTo": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "jakarta.jms.Destination", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS reply-to destination.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_REPLY_TO" },
     "JMSType": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS type.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_TYPE" },
     "JMSXUserID": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The XUser id.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_XUSER_ID" },
     "CamelJmsMessageType": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "org.apache.camel.component.jms.JmsMessageType", "enum": [ "Bytes", "Map", "Object", "Stream", "Text", "Blob" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The message type.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_MESSAGE_TYPE" },
@@ -146,10 +146,10 @@
     "destinationType": { "kind": "path", "displayName": "Destination Type", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "queue", "topic", "temp-queue", "temp-topic" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "queue", "description": "The kind of destination to use" },
     "destinationName": { "kind": "path", "displayName": "Destination Name", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Name of the queue or topic to use as destination" },
     "clientId": { "kind": "parameter", "displayName": "Client Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets the JMS client ID to use. Note that this value, if specified, must be unique and can only be used by a single JMS connection instance [...]
-    "connectionFactory": { "kind": "parameter", "displayName": "Connection Factory", "group": "common", "label": "", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The connection factory to be use. A connection factory must be configured either on the component or endpoint." },
+    "connectionFactory": { "kind": "parameter", "displayName": "Connection Factory", "group": "common", "label": "", "required": false, "type": "object", "javaType": "jakarta.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The connection factory to be use. A connection factory must be configured either on the component or endpoint." },
     "disableReplyTo": { "kind": "parameter", "displayName": "Disable Reply To", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back t [...]
     "durableSubscriptionName": { "kind": "parameter", "displayName": "Durable Subscription Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The durable subscriber name for specifying durable topic subscriptions. The clientId option must be configu [...]
-    "jmsMessageType": { "kind": "parameter", "displayName": "Jms Message Type", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.JmsMessageType", "enum": [ "Bytes", "Map", "Object", "Stream", "Text" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows you to force the use of a specifi [...]
+    "jmsMessageType": { "kind": "parameter", "displayName": "Jms Message Type", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.JmsMessageType", "enum": [ "Bytes", "Map", "Object", "Stream", "Text" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows you to force the use of a specifi [...]
     "replyTo": { "kind": "parameter", "displayName": "Reply To", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer)." },
     "testConnectionOnStartup": { "kind": "parameter", "displayName": "Test Connection On Startup", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether to test the connection on startup. This ensures that when Camel starts th [...]
     "acknowledgementModeName": { "kind": "parameter", "displayName": "Acknowledgement Mode Name", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "SESSION_TRANSACTED", "CLIENT_ACKNOWLEDGE", "AUTO_ACKNOWLEDGE", "DUPS_OK_ACKNOWLEDGE" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "AUTO_ACKNOWLEDGE", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationFie [...]
@@ -178,7 +178,7 @@
     "replyToSameDestinationAllowed": { "kind": "parameter", "displayName": "Reply To Same Destination Allowed", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Whether a JMS consumer is allowed to send a repl [...]
     "taskExecutor": { "kind": "parameter", "displayName": "Task Executor", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.springframework.core.task.TaskExecutor", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows you to specify a custom task executor for consuming messages." },
     "deliveryDelay": { "kind": "parameter", "displayName": "Delivery Delay", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": -1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets delivery delay to use for send calls for JMS. This option requires JMS 2.0 compliant broker." },
-    "deliveryMode": { "kind": "parameter", "displayName": "Delivery Mode", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "enum": [ "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryM [...]
+    "deliveryMode": { "kind": "parameter", "displayName": "Delivery Mode", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "enum": [ "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the delivery mode to be used. Possible values are those defined by jakarta.jms.Deliver [...]
     "deliveryPersistent": { "kind": "parameter", "displayName": "Delivery Persistent", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether persistent delivery is used by default." },
     "explicitQosEnabled": { "kind": "parameter", "displayName": "Explicit Qos Enabled", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Set if the deliveryMode, priority or timeToLive qualities of service should be u [...]
     "formatDateHeadersToIso8601": { "kind": "parameter", "displayName": "Format Date Headers To Iso8601", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets whether JMS date properties should be formatted according to the ISO  [...]
@@ -208,16 +208,16 @@
     "asyncStopListener": { "kind": "parameter", "displayName": "Async Stop Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Whether to stop the JmsConsumer message listener asynchronously, when stopping a route." },
     "destinationResolver": { "kind": "parameter", "displayName": "Destination Resolver", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.springframework.jms.support.destination.DestinationResolver", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "A pluggable org.springframework.jms.support.destination.Des [...]
     "errorHandler": { "kind": "parameter", "displayName": "Error Handler", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.springframework.util.ErrorHandler", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions  [...]
-    "exceptionListener": { "kind": "parameter", "displayName": "Exception Listener", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ExceptionListener", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions." },
+    "exceptionListener": { "kind": "parameter", "displayName": "Exception Listener", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.jms.ExceptionListener", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions." },
     "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message." },
     "idleConsumerLimit": { "kind": "parameter", "displayName": "Idle Consumer Limit", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specify the limit for the number of consumers that are allowed to be idle at any given time." },
     "idleTaskExecutionLimit": { "kind": "parameter", "displayName": "Idle Task Execution Limit", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the limit for idle executions of a receive task, not having received any message  [...]
     "includeAllJMSXProperties": { "kind": "parameter", "displayName": "Include All JMSXProperties", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Whether to include all JMSXxxx properties when mapping from JMS to Camel Message [...]
     "jmsKeyFormatStrategy": { "kind": "parameter", "displayName": "Jms Key Format Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.JmsKeyFormatStrategy", "enum": [ "default", "passthrough" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Pluggable strategy for encodi [...]
-    "mapJmsMessage": { "kind": "parameter", "displayName": "Map Jms Message", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should auto map the received JMS message to a suited payload type, such as java [...]
+    "mapJmsMessage": { "kind": "parameter", "displayName": "Map Jms Message", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should auto map the received JMS message to a suited payload type, such as jaka [...]
     "maxMessagesPerTask": { "kind": "parameter", "displayName": "Max Messages Per Task", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": -1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The number of messages per task. -1 is unlimited. If you use a range for concurrent consumers (eg  [...]
-    "messageConverter": { "kind": "parameter", "displayName": "Message Converter", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.springframework.jms.support.converter.MessageConverter", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "To use a custom Spring org.springframework.jms.support.converter.Messa [...]
-    "messageCreatedStrategy": { "kind": "parameter", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "To use the given MessageCreatedStrategy which are invoked when [...]
+    "messageConverter": { "kind": "parameter", "displayName": "Message Converter", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.springframework.jms.support.converter.MessageConverter", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "To use a custom Spring org.springframework.jms.support.converter.Messa [...]
+    "messageCreatedStrategy": { "kind": "parameter", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "To use the given MessageCreatedStrategy which are invoked when [...]
     "messageIdEnabled": { "kind": "parameter", "displayName": "Message Id Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "When sending, specifies whether message IDs should be added. This is just an hint to the JMS brok [...]
     "messageListenerContainerFactory": { "kind": "parameter", "displayName": "Message Listener Container Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.MessageListenerContainerFactory", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Registry ID of the MessageListener [...]
     "messageTimestampEnabled": { "kind": "parameter", "displayName": "Message Timestamp Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether timestamps should be enabled by default on sending messages. This [...]
@@ -226,7 +226,7 @@
     "recoveryInterval": { "kind": "parameter", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in mi [...]
     "requestTimeoutCheckerInterval": { "kind": "parameter", "displayName": "Request Timeout Checker Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1000", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Configures how often Camel should check for timed out Exchanges when d [...]
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets whether synchronous processing should be strictly used" },
-    "transferException": { "kind": "parameter", "displayName": "Transfer Exception", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the cons [...]
+    "transferException": { "kind": "parameter", "displayName": "Transfer Exception", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the cons [...]
     "transferExchange": { "kind": "parameter", "displayName": "Transfer Exchange", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "You can transfer the exchange over the wire instead of just the body and headers. The following f [...]
     "useMessageIDAsCorrelationID": { "kind": "parameter", "displayName": "Use Message IDAs Correlation ID", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether JMSMessageID should always be used as JMSCorrelationID [...]
     "waitForProvisionCorrelationToBeUpdatedCounter": { "kind": "parameter", "displayName": "Wait For Provision Correlation To Be Updated Counter", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 50, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Number of times to wait for provisional  [...]
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..54e72e197a3 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",
@@ -55,7 +55,7 @@
     "httpMethodRestrict": { "kind": "parameter", "displayName": "Http Method Restrict", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Used to only allow consuming if the HttpMethod matches, such as GET\/POST\/PUT etc. Multiple methods can be specified separated by comma." },
     "matchOnUriPrefix": { "kind": "parameter", "displayName": "Match On Uri Prefix", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether or not the consumer should try to find a target consumer by matching the URI prefix if no exact match is found." },
     "muteException": { "kind": "parameter", "displayName": "Mute Exception", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If enabled and an Exchange failed processing on the consumer side the response's body won't contain the exception's stack trace." },
-    "responseBufferSize": { "kind": "parameter", "displayName": "Response Buffer Size", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom buffer size on the javax.servlet.ServletResponse." },
+    "responseBufferSize": { "kind": "parameter", "displayName": "Response Buffer Size", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom buffer size on the jakarta.servlet.ServletResponse." },
     "servletName": { "kind": "parameter", "displayName": "Servlet Name", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "CamelServlet", "description": "Name of the servlet to use" },
     "attachmentMultipartBinding": { "kind": "parameter", "displayName": "Attachment Multipart Binding", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to automatic bind multipart\/form-data as attachments on the Camel Exchange. The options attachmentMultipartBinding=true and disableStreamCache=false cannot wor [...]
     "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now [...]
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 ab3d54d62bd..bf7f8bb0a48 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 2c793a29dda..380155707c1 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..6603042bec5 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",
@@ -25,21 +25,21 @@
     "ignoreXmlConfiguration": { "kind": "property", "displayName": "Ignore Xml Configuration", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to ignore data from the META-INF\/validation.xml file." },
     "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...]
     "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
-    "constraintValidatorFactory": { "kind": "property", "displayName": "Constraint Validator Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.validation.ConstraintValidatorFactory", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom ConstraintValidatorFactory" },
-    "messageInterpolator": { "kind": "property", "displayName": "Message Interpolator", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.validation.MessageInterpolator", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom MessageInterpolator" },
-    "traversableResolver": { "kind": "property", "displayName": "Traversable Resolver", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.validation.TraversableResolver", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom TraversableResolver" },
-    "validationProviderResolver": { "kind": "property", "displayName": "Validation Provider Resolver", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.validation.ValidationProviderResolver", "deprecated": false, "autowired": false, "secret": false, "description": "To use a a custom ValidationProviderResolver" },
-    "validatorFactory": { "kind": "property", "displayName": "Validator Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.validation.ValidatorFactory", "deprecated": false, "autowired": true, "secret": false, "description": "To use a custom ValidatorFactory" }
+    "constraintValidatorFactory": { "kind": "property", "displayName": "Constraint Validator Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.validation.ConstraintValidatorFactory", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom ConstraintValidatorFactory" },
+    "messageInterpolator": { "kind": "property", "displayName": "Message Interpolator", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.validation.MessageInterpolator", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom MessageInterpolator" },
+    "traversableResolver": { "kind": "property", "displayName": "Traversable Resolver", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.validation.TraversableResolver", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom TraversableResolver" },
+    "validationProviderResolver": { "kind": "property", "displayName": "Validation Provider Resolver", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.validation.ValidationProviderResolver", "deprecated": false, "autowired": false, "secret": false, "description": "To use a a custom ValidationProviderResolver" },
+    "validatorFactory": { "kind": "property", "displayName": "Validator Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.validation.ValidatorFactory", "deprecated": false, "autowired": true, "secret": false, "description": "To use a custom ValidatorFactory" }
   },
   "properties": {
     "label": { "kind": "path", "displayName": "Label", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Where label is an arbitrary text value describing the endpoint" },
-    "group": { "kind": "parameter", "displayName": "Group", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "javax.validation.groups.Default", "description": "To use a custom validation group" },
+    "group": { "kind": "parameter", "displayName": "Group", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "jakarta.validation.groups.Default", "description": "To use a custom validation group" },
     "ignoreXmlConfiguration": { "kind": "parameter", "displayName": "Ignore Xml Configuration", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to ignore data from the META-INF\/validation.xml file." },
     "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may other [...]
-    "constraintValidatorFactory": { "kind": "parameter", "displayName": "Constraint Validator Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.validation.ConstraintValidatorFactory", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom ConstraintValidatorFactory" },
-    "messageInterpolator": { "kind": "parameter", "displayName": "Message Interpolator", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.validation.MessageInterpolator", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom MessageInterpolator" },
-    "traversableResolver": { "kind": "parameter", "displayName": "Traversable Resolver", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.validation.TraversableResolver", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom TraversableResolver" },
-    "validationProviderResolver": { "kind": "parameter", "displayName": "Validation Provider Resolver", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.validation.ValidationProviderResolver", "deprecated": false, "autowired": false, "secret": false, "description": "To use a a custom ValidationProviderResolver" },
-    "validatorFactory": { "kind": "parameter", "displayName": "Validator Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.validation.ValidatorFactory", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom ValidatorFactory" }
+    "constraintValidatorFactory": { "kind": "parameter", "displayName": "Constraint Validator Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.validation.ConstraintValidatorFactory", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom ConstraintValidatorFactory" },
+    "messageInterpolator": { "kind": "parameter", "displayName": "Message Interpolator", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.validation.MessageInterpolator", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom MessageInterpolator" },
+    "traversableResolver": { "kind": "parameter", "displayName": "Traversable Resolver", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.validation.TraversableResolver", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom TraversableResolver" },
+    "validationProviderResolver": { "kind": "parameter", "displayName": "Validation Provider Resolver", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.validation.ValidationProviderResolver", "deprecated": false, "autowired": false, "secret": false, "description": "To use a a custom ValidationProviderResolver" },
+    "validatorFactory": { "kind": "parameter", "displayName": "Validator Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.validation.ValidatorFactory", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom ValidatorFactory" }
   }
 }
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 6284f7ecc2e..0ac5227ba87 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 d186fdc5335..712abfae40d 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 e3ef623f847..3adb77edeb0 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..4ad9a0d3f52 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",
@@ -33,7 +33,7 @@
     "handleFailedMessage": { "kind": "property", "displayName": "Handle Failed Message", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "If the mail consumer cannot retrieve a given mail message, then th [...]
     "mimeDecodeHeaders": { "kind": "property", "displayName": "Mime Decode Headers", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "This option enables transparent MIME decoding and unfolding for mail h [...]
     "moveTo": { "kind": "property", "displayName": "Move To", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "After processing a mail message, it can be moved to a mail folder with the given name. You can override this [...]
-    "peek": { "kind": "property", "displayName": "Peek", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Will mark the javax.mail.Message as peeked before processing the mail message. This applies to IMAP [...]
+    "peek": { "kind": "property", "displayName": "Peek", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Will mark the jakarta.mail.Message as peeked before processing the mail message. This applies to IM [...]
     "skipFailedMessage": { "kind": "property", "displayName": "Skip Failed Message", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "If the mail consumer cannot retrieve a given mail message, then this o [...]
     "unseen": { "kind": "property", "displayName": "Unseen", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to limit by unseen mails only." },
     "failOnDuplicateFileAttachment": { "kind": "property", "displayName": "Fail On Duplicate File Attachment", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to fail processing the mail if the mail [...]
@@ -41,7 +41,7 @@
     "folderName": { "kind": "property", "displayName": "Folder Name", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "INBOX", "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The folder to poll." },
     "generateMissingAttachmentNames": { "kind": "property", "displayName": "Generate Missing Attachment Names", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Set this to 'uuid' to set a UUID for the filename of the atta [...]
     "handleDuplicateAttachmentNames": { "kind": "property", "displayName": "Handle Duplicate Attachment Names", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Set the strategy to handle duplicate filenames of attachments [...]
-    "mapMailMessage": { "kind": "property", "displayName": "Map Mail Message", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should map the received mail message to Camel body\/head [...]
+    "mapMailMessage": { "kind": "property", "displayName": "Map Mail Message", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should map the received mail message to Camel body\/head [...]
     "bcc": { "kind": "property", "displayName": "Bcc", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the BCC email address. Separate multiple email addresses with comma." },
     "cc": { "kind": "property", "displayName": "Cc", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the CC email address. Separate multiple email addresses with comma." },
     "from": { "kind": "property", "displayName": "From", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "camel@localhost", "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The from email address" },
@@ -63,7 +63,7 @@
     "ignoreUnsupportedCharset": { "kind": "property", "displayName": "Ignore Unsupported Charset", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending ma [...]
     "ignoreUriScheme": { "kind": "property", "displayName": "Ignore Uri Scheme", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the charse [...]
     "javaMailProperties": { "kind": "property", "displayName": "Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the java mail options. Will clear any default properties and only use the properties provided for [...]
-    "session": { "kind": "property", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.mail.Session", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are created  [...]
+    "session": { "kind": "property", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.mail.Session", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are create [...]
     "useInlineAttachments": { "kind": "property", "displayName": "Use Inline Attachments", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to use disposition inline or attachment." },
     "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." },
     "password": { "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The password for login. See also setAuthenticator(MailAuthenticator)." },
@@ -96,7 +96,7 @@
     "maxMessagesPerPoll": { "kind": "parameter", "displayName": "Max Messages Per Poll", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the maximum number of messages to gather per poll. By default, no maximum is set. Can be used to set a limit of e.g. 1000 to avoid downloading thousands of files when the server starts up. Set a value of 0 or negative to [...]
     "mimeDecodeHeaders": { "kind": "parameter", "displayName": "Mime Decode Headers", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "This option enables transparent MIME decoding and unfolding for mail  [...]
     "moveTo": { "kind": "parameter", "displayName": "Move To", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "After processing a mail message, it can be moved to a mail folder with the given name. You can override thi [...]
-    "peek": { "kind": "parameter", "displayName": "Peek", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Will mark the javax.mail.Message as peeked before processing the mail message. This applies to IMA [...]
+    "peek": { "kind": "parameter", "displayName": "Peek", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Will mark the jakarta.mail.Message as peeked before processing the mail message. This applies to I [...]
     "sendEmptyMessageWhenIdle": { "kind": "parameter", "displayName": "Send Empty Message When Idle", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead." },
     "skipFailedMessage": { "kind": "parameter", "displayName": "Skip Failed Message", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "If the mail consumer cannot retrieve a given mail message, then this  [...]
     "unseen": { "kind": "parameter", "displayName": "Unseen", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to limit by unseen mails only." },
@@ -109,7 +109,7 @@
     "generateMissingAttachmentNames": { "kind": "parameter", "displayName": "Generate Missing Attachment Names", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Set this to 'uuid' to set a UUID for the filename of the att [...]
     "handleDuplicateAttachmentNames": { "kind": "parameter", "displayName": "Handle Duplicate Attachment Names", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Set the strategy to handle duplicate filenames of attachment [...]
     "mailUidGenerator": { "kind": "parameter", "displayName": "Mail Uid Generator", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.MailUidGenerator", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable MailUidGenerator that allows to use custom logic to generate UUID of the mail message." },
-    "mapMailMessage": { "kind": "parameter", "displayName": "Map Mail Message", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should map the received mail message to Camel body\/hea [...]
+    "mapMailMessage": { "kind": "parameter", "displayName": "Map Mail Message", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should map the received mail message to Camel body\/hea [...]
     "pollStrategy": { "kind": "parameter", "displayName": "Poll Strategy", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.PollingConsumerPollStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation  [...]
     "postProcessAction": { "kind": "parameter", "displayName": "Post Process Action", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.MailBoxPostProcessAction", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to an MailBoxPostProcessAction for doing post processing tasks on the mailbox once the normal processing ended." },
     "bcc": { "kind": "parameter", "displayName": "Bcc", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the BCC email address. Separate multiple email addresses with comma." },
@@ -133,11 +133,11 @@
     "ignoreUnsupportedCharset": { "kind": "parameter", "displayName": "Ignore Unsupported Charset", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending m [...]
     "ignoreUriScheme": { "kind": "parameter", "displayName": "Ignore Uri Scheme", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the chars [...]
     "javaMailProperties": { "kind": "parameter", "displayName": "Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the java mail options. Will clear any default properties and only use the properties provided fo [...]
-    "session": { "kind": "parameter", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.mail.Session", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are created [...]
+    "session": { "kind": "parameter", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.mail.Session", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are creat [...]
     "useInlineAttachments": { "kind": "parameter", "displayName": "Use Inline Attachments", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to use disposition inline or attachment." },
     "idempotentRepository": { "kind": "parameter", "displayName": "Idempotent Repository", "group": "filter", "label": "consumer,filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.IdempotentRepository", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable repository org.apache.camel.spi.IdempotentRepository which allows to cluster consuming from the same mailbox, and let the repository coordinate whether a mail message is vali [...]
     "idempotentRepositoryRemoveOnCommit": { "kind": "parameter", "displayName": "Idempotent Repository Remove On Commit", "group": "filter", "label": "consumer,filter", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "When using idempotent repository, then when the mail message has been successfully processed and is committed, should the message id be removed from the idempotent re [...]
-    "searchTerm": { "kind": "parameter", "displayName": "Search Term", "group": "filter", "label": "consumer,filter", "required": false, "type": "object", "javaType": "javax.mail.search.SearchTerm", "prefix": "searchTerm.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "description": "Refers to a javax.mail.search.SearchTerm which allows to filter mails based on search criteria such as subject, body, from, sent after a certain date etc." },
+    "searchTerm": { "kind": "parameter", "displayName": "Search Term", "group": "filter", "label": "consumer,filter", "required": false, "type": "object", "javaType": "jakarta.mail.search.SearchTerm", "prefix": "searchTerm.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "description": "Refers to a jakarta.mail.search.SearchTerm which allows to filter mails based on search criteria such as subject, body, from, sent after a certain date etc." },
     "backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." },
     "backoffIdleThreshold": { "kind": "parameter", "displayName": "Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." },
     "backoffMultiplier": { "kind": "parameter", "displayName": "Backoff Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening agai [...]
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..e049ce86d24 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",
@@ -33,7 +33,7 @@
     "handleFailedMessage": { "kind": "property", "displayName": "Handle Failed Message", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "If the mail consumer cannot retrieve a given mail message, then th [...]
     "mimeDecodeHeaders": { "kind": "property", "displayName": "Mime Decode Headers", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "This option enables transparent MIME decoding and unfolding for mail h [...]
     "moveTo": { "kind": "property", "displayName": "Move To", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "After processing a mail message, it can be moved to a mail folder with the given name. You can override this [...]
-    "peek": { "kind": "property", "displayName": "Peek", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Will mark the javax.mail.Message as peeked before processing the mail message. This applies to IMAP [...]
+    "peek": { "kind": "property", "displayName": "Peek", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Will mark the jakarta.mail.Message as peeked before processing the mail message. This applies to IM [...]
     "skipFailedMessage": { "kind": "property", "displayName": "Skip Failed Message", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "If the mail consumer cannot retrieve a given mail message, then this o [...]
     "unseen": { "kind": "property", "displayName": "Unseen", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to limit by unseen mails only." },
     "failOnDuplicateFileAttachment": { "kind": "property", "displayName": "Fail On Duplicate File Attachment", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to fail processing the mail if the mail [...]
@@ -41,7 +41,7 @@
     "folderName": { "kind": "property", "displayName": "Folder Name", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "INBOX", "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The folder to poll." },
     "generateMissingAttachmentNames": { "kind": "property", "displayName": "Generate Missing Attachment Names", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Set this to 'uuid' to set a UUID for the filename of the atta [...]
     "handleDuplicateAttachmentNames": { "kind": "property", "displayName": "Handle Duplicate Attachment Names", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Set the strategy to handle duplicate filenames of attachments [...]
-    "mapMailMessage": { "kind": "property", "displayName": "Map Mail Message", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should map the received mail message to Camel body\/head [...]
+    "mapMailMessage": { "kind": "property", "displayName": "Map Mail Message", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should map the received mail message to Camel body\/head [...]
     "bcc": { "kind": "property", "displayName": "Bcc", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the BCC email address. Separate multiple email addresses with comma." },
     "cc": { "kind": "property", "displayName": "Cc", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the CC email address. Separate multiple email addresses with comma." },
     "from": { "kind": "property", "displayName": "From", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "camel@localhost", "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The from email address" },
@@ -63,7 +63,7 @@
     "ignoreUnsupportedCharset": { "kind": "property", "displayName": "Ignore Unsupported Charset", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending ma [...]
     "ignoreUriScheme": { "kind": "property", "displayName": "Ignore Uri Scheme", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the charse [...]
     "javaMailProperties": { "kind": "property", "displayName": "Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the java mail options. Will clear any default properties and only use the properties provided for [...]
-    "session": { "kind": "property", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.mail.Session", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are created  [...]
+    "session": { "kind": "property", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.mail.Session", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are create [...]
     "useInlineAttachments": { "kind": "property", "displayName": "Use Inline Attachments", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to use disposition inline or attachment." },
     "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." },
     "password": { "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The password for login. See also setAuthenticator(MailAuthenticator)." },
@@ -96,7 +96,7 @@
     "maxMessagesPerPoll": { "kind": "parameter", "displayName": "Max Messages Per Poll", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the maximum number of messages to gather per poll. By default, no maximum is set. Can be used to set a limit of e.g. 1000 to avoid downloading thousands of files when the server starts up. Set a value of 0 or negative to [...]
     "mimeDecodeHeaders": { "kind": "parameter", "displayName": "Mime Decode Headers", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "This option enables transparent MIME decoding and unfolding for mail  [...]
     "moveTo": { "kind": "parameter", "displayName": "Move To", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "After processing a mail message, it can be moved to a mail folder with the given name. You can override thi [...]
-    "peek": { "kind": "parameter", "displayName": "Peek", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Will mark the javax.mail.Message as peeked before processing the mail message. This applies to IMA [...]
+    "peek": { "kind": "parameter", "displayName": "Peek", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Will mark the jakarta.mail.Message as peeked before processing the mail message. This applies to I [...]
     "sendEmptyMessageWhenIdle": { "kind": "parameter", "displayName": "Send Empty Message When Idle", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead." },
     "skipFailedMessage": { "kind": "parameter", "displayName": "Skip Failed Message", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "If the mail consumer cannot retrieve a given mail message, then this  [...]
     "unseen": { "kind": "parameter", "displayName": "Unseen", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to limit by unseen mails only." },
@@ -109,7 +109,7 @@
     "generateMissingAttachmentNames": { "kind": "parameter", "displayName": "Generate Missing Attachment Names", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Set this to 'uuid' to set a UUID for the filename of the att [...]
     "handleDuplicateAttachmentNames": { "kind": "parameter", "displayName": "Handle Duplicate Attachment Names", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Set the strategy to handle duplicate filenames of attachment [...]
     "mailUidGenerator": { "kind": "parameter", "displayName": "Mail Uid Generator", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.MailUidGenerator", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable MailUidGenerator that allows to use custom logic to generate UUID of the mail message." },
-    "mapMailMessage": { "kind": "parameter", "displayName": "Map Mail Message", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should map the received mail message to Camel body\/hea [...]
+    "mapMailMessage": { "kind": "parameter", "displayName": "Map Mail Message", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should map the received mail message to Camel body\/hea [...]
     "pollStrategy": { "kind": "parameter", "displayName": "Poll Strategy", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.PollingConsumerPollStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation  [...]
     "postProcessAction": { "kind": "parameter", "displayName": "Post Process Action", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.MailBoxPostProcessAction", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to an MailBoxPostProcessAction for doing post processing tasks on the mailbox once the normal processing ended." },
     "bcc": { "kind": "parameter", "displayName": "Bcc", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the BCC email address. Separate multiple email addresses with comma." },
@@ -133,11 +133,11 @@
     "ignoreUnsupportedCharset": { "kind": "parameter", "displayName": "Ignore Unsupported Charset", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending m [...]
     "ignoreUriScheme": { "kind": "parameter", "displayName": "Ignore Uri Scheme", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the chars [...]
     "javaMailProperties": { "kind": "parameter", "displayName": "Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the java mail options. Will clear any default properties and only use the properties provided fo [...]
-    "session": { "kind": "parameter", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.mail.Session", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are created [...]
+    "session": { "kind": "parameter", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.mail.Session", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are creat [...]
     "useInlineAttachments": { "kind": "parameter", "displayName": "Use Inline Attachments", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to use disposition inline or attachment." },
     "idempotentRepository": { "kind": "parameter", "displayName": "Idempotent Repository", "group": "filter", "label": "consumer,filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.IdempotentRepository", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable repository org.apache.camel.spi.IdempotentRepository which allows to cluster consuming from the same mailbox, and let the repository coordinate whether a mail message is vali [...]
     "idempotentRepositoryRemoveOnCommit": { "kind": "parameter", "displayName": "Idempotent Repository Remove On Commit", "group": "filter", "label": "consumer,filter", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "When using idempotent repository, then when the mail message has been successfully processed and is committed, should the message id be removed from the idempotent re [...]
-    "searchTerm": { "kind": "parameter", "displayName": "Search Term", "group": "filter", "label": "consumer,filter", "required": false, "type": "object", "javaType": "javax.mail.search.SearchTerm", "prefix": "searchTerm.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "description": "Refers to a javax.mail.search.SearchTerm which allows to filter mails based on search criteria such as subject, body, from, sent after a certain date etc." },
+    "searchTerm": { "kind": "parameter", "displayName": "Search Term", "group": "filter", "label": "consumer,filter", "required": false, "type": "object", "javaType": "jakarta.mail.search.SearchTerm", "prefix": "searchTerm.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "description": "Refers to a jakarta.mail.search.SearchTerm which allows to filter mails based on search criteria such as subject, body, from, sent after a certain date etc." },
     "backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." },
     "backoffIdleThreshold": { "kind": "parameter", "displayName": "Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." },
     "backoffMultiplier": { "kind": "parameter", "displayName": "Backoff Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening agai [...]
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 d3ad72bfbe8..3cb9c8bad78 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/influxdb2.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/influxdb2.json
index 5307cf369a0..2fe82e5e9c2 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/influxdb2.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/influxdb2.json
@@ -11,7 +11,7 @@
     "supportLevel": "Preview",
     "groupId": "org.apache.camel",
     "artifactId": "camel-influxdb2",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "influxdb2",
     "extendsScheme": "",
     "syntax": "influxdb2: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..932d1f3b777 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",
@@ -75,7 +75,7 @@
     "httpMethodRestrict": { "kind": "parameter", "displayName": "Http Method Restrict", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Used to only allow consuming if the HttpMethod matches, such as GET\/POST\/PUT etc. Multiple methods can be specified separated by comma." },
     "matchOnUriPrefix": { "kind": "parameter", "displayName": "Match On Uri Prefix", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether or not the consumer should try to find a target consumer by matching the URI prefix if no exact match is found." },
     "muteException": { "kind": "parameter", "displayName": "Mute Exception", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If enabled and an Exchange failed processing on the consumer side the response's body won't contain the exception's stack trace." },
-    "responseBufferSize": { "kind": "parameter", "displayName": "Response Buffer Size", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom buffer size on the javax.servlet.ServletResponse." },
+    "responseBufferSize": { "kind": "parameter", "displayName": "Response Buffer Size", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom buffer size on the jakarta.servlet.ServletResponse." },
     "sendDateHeader": { "kind": "parameter", "displayName": "Send Date Header", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If the option is true, jetty server will send the date header to the client which sends the request. NOTE please make sure there is no any other camel-jetty endpoint is share the same port, otherwise this option  [...]
     "sendServerVersion": { "kind": "parameter", "displayName": "Send Server Version", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "If the option is true, jetty will send the server header with the jetty version information to the client which sends the request. NOTE please make sure there is no any other camel-jetty endpoint is share th [...]
     "sessionSupport": { "kind": "parameter", "displayName": "Session Support", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether to enable the session manager on the server side of Jetty." },
@@ -86,12 +86,12 @@
     "exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
     "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
     "filterInitParameters": { "kind": "parameter", "displayName": "Filter Init Parameters", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.String>", "prefix": "filter.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "description": "Configuration of the filter init parameters. These parameters will be applied to the filter list before starting the jett [...]
-    "filters": { "kind": "parameter", "displayName": "Filters", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "array", "javaType": "java.util.List<javax.servlet.Filter>", "deprecated": false, "autowired": false, "secret": false, "description": "Allows using a custom filters which is putted into a list and can be find in the Registry. Multiple values can be separated by comma." },
+    "filters": { "kind": "parameter", "displayName": "Filters", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "array", "javaType": "java.util.List<jakarta.servlet.Filter>", "deprecated": false, "autowired": false, "secret": false, "description": "Allows using a custom filters which is putted into a list and can be find in the Registry. Multiple values can be separated by comma." },
     "handlers": { "kind": "parameter", "displayName": "Handlers", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "array", "javaType": "java.util.List<org.eclipse.jetty.server.Handler>", "deprecated": false, "autowired": false, "secret": false, "description": "Specifies a comma-delimited set of Handler instances to lookup in your Registry. These handlers are added to the Jetty servlet context (for example, to add security). Important: You can not  [...]
     "mapHttpMessageBody": { "kind": "parameter", "displayName": "Map Http Message Body", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "If this option is true then IN exchange Body of the exchange will be mapped to HTTP body. Setting this to false will avoid the HTTP mapping." },
     "mapHttpMessageFormUrlEncodedBody": { "kind": "parameter", "displayName": "Map Http Message Form Url Encoded Body", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "If this option is true then IN exchange Form Encoded body of the exchange will be mapped to HTTP. Setting this to false will avoid the HTTP Form Encoded  [...]
     "mapHttpMessageHeaders": { "kind": "parameter", "displayName": "Map Http Message Headers", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "If this option is true then IN exchange Headers of the exchange will be mapped to HTTP headers. Setting this to false will avoid the HTTP Headers mapping." },
-    "multipartFilter": { "kind": "parameter", "displayName": "Multipart Filter", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "javax.servlet.Filter", "deprecated": false, "autowired": false, "secret": false, "description": "Allows using a custom multipart filter. Note: setting multipartFilterRef forces the value of enableMultipartFilter to true." },
+    "multipartFilter": { "kind": "parameter", "displayName": "Multipart Filter", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "jakarta.servlet.Filter", "deprecated": false, "autowired": false, "secret": false, "description": "Allows using a custom multipart filter. Note: setting multipartFilterRef forces the value of enableMultipartFilter to true." },
     "optionsEnabled": { "kind": "parameter", "displayName": "Options Enabled", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off." },
     "traceEnabled": { "kind": "parameter", "displayName": "Trace Enabled", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether to enable HTTP TRACE for this Servlet consumer. By default TRACE is turned off." },
     "sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "autowired": false, "secret": false, "description": "To configure security using SSLContextParameters" }
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..7dfed64264a 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",
@@ -24,10 +24,10 @@
   },
   "componentProperties": {
     "clientId": { "kind": "property", "displayName": "Client Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets the JMS client ID to use. Note that this value, if specified, must be unique and can only be used by a single JMS connection instance. [...]
-    "connectionFactory": { "kind": "property", "displayName": "Connection Factory", "group": "common", "label": "", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The connection factory to be use. A connection factory must be configured either on the component or endpoint." },
+    "connectionFactory": { "kind": "property", "displayName": "Connection Factory", "group": "common", "label": "", "required": false, "type": "object", "javaType": "jakarta.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The connection factory to be use. A connection factory must be configured either on the component or endpoint." },
     "disableReplyTo": { "kind": "property", "displayName": "Disable Reply To", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to [...]
     "durableSubscriptionName": { "kind": "property", "displayName": "Durable Subscription Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The durable subscriber name for specifying durable topic subscriptions. The clientId option must be configur [...]
-    "jmsMessageType": { "kind": "property", "displayName": "Jms Message Type", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.JmsMessageType", "enum": [ "Bytes", "Map", "Object", "Stream", "Text" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows you to force the use of a specific [...]
+    "jmsMessageType": { "kind": "property", "displayName": "Jms Message Type", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.JmsMessageType", "enum": [ "Bytes", "Map", "Object", "Stream", "Text" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows you to force the use of a specific [...]
     "replyTo": { "kind": "property", "displayName": "Reply To", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer)." },
     "testConnectionOnStartup": { "kind": "property", "displayName": "Test Connection On Startup", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether to test the connection on startup. This ensures that when Camel starts tha [...]
     "acknowledgementModeName": { "kind": "property", "displayName": "Acknowledgement Mode Name", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "SESSION_TRANSACTED", "CLIENT_ACKNOWLEDGE", "AUTO_ACKNOWLEDGE", "DUPS_OK_ACKNOWLEDGE" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "AUTO_ACKNOWLEDGE", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationFiel [...]
@@ -54,7 +54,7 @@
     "replyToSameDestinationAllowed": { "kind": "property", "displayName": "Reply To Same Destination Allowed", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Whether a JMS consumer is allowed to send a reply [...]
     "taskExecutor": { "kind": "property", "displayName": "Task Executor", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.springframework.core.task.TaskExecutor", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows you to specify a custom task executor for consuming messages." },
     "deliveryDelay": { "kind": "property", "displayName": "Delivery Delay", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": -1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets delivery delay to use for send calls for JMS. This option requires JMS 2.0 compliant broker." },
-    "deliveryMode": { "kind": "property", "displayName": "Delivery Mode", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "enum": [ "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMo [...]
+    "deliveryMode": { "kind": "property", "displayName": "Delivery Mode", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "enum": [ "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the delivery mode to be used. Possible values are those defined by jakarta.jms.Delivery [...]
     "deliveryPersistent": { "kind": "property", "displayName": "Delivery Persistent", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether persistent delivery is used by default." },
     "explicitQosEnabled": { "kind": "property", "displayName": "Explicit Qos Enabled", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Set if the deliveryMode, priority or timeToLive qualities of service should be us [...]
     "formatDateHeadersToIso8601": { "kind": "property", "displayName": "Format Date Headers To Iso8601", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets whether JMS date properties should be formatted according to the ISO 8 [...]
@@ -88,15 +88,15 @@
     "configuration": { "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.JmsConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "To use a shared JMS configuration" },
     "destinationResolver": { "kind": "property", "displayName": "Destination Resolver", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.springframework.jms.support.destination.DestinationResolver", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "A pluggable org.springframework.jms.support.destination.Dest [...]
     "errorHandler": { "kind": "property", "displayName": "Error Handler", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.springframework.util.ErrorHandler", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions t [...]
-    "exceptionListener": { "kind": "property", "displayName": "Exception Listener", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ExceptionListener", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions." },
+    "exceptionListener": { "kind": "property", "displayName": "Exception Listener", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.jms.ExceptionListener", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions." },
     "idleConsumerLimit": { "kind": "property", "displayName": "Idle Consumer Limit", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specify the limit for the number of consumers that are allowed to be idle at any given time." },
     "idleTaskExecutionLimit": { "kind": "property", "displayName": "Idle Task Execution Limit", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the limit for idle executions of a receive task, not having received any message w [...]
     "includeAllJMSXProperties": { "kind": "property", "displayName": "Include All JMSXProperties", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Whether to include all JMSXxxx properties when mapping from JMS to Camel Message. [...]
     "jmsKeyFormatStrategy": { "kind": "property", "displayName": "Jms Key Format Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.JmsKeyFormatStrategy", "enum": [ "default", "passthrough" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Pluggable strategy for encodin [...]
-    "mapJmsMessage": { "kind": "property", "displayName": "Map Jms Message", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should auto map the received JMS message to a suited payload type, such as javax [...]
+    "mapJmsMessage": { "kind": "property", "displayName": "Map Jms Message", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should auto map the received JMS message to a suited payload type, such as jakar [...]
     "maxMessagesPerTask": { "kind": "property", "displayName": "Max Messages Per Task", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": -1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The number of messages per task. -1 is unlimited. If you use a range for concurrent consumers (eg m [...]
-    "messageConverter": { "kind": "property", "displayName": "Message Converter", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.springframework.jms.support.converter.MessageConverter", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "To use a custom Spring org.springframework.jms.support.converter.Messag [...]
-    "messageCreatedStrategy": { "kind": "property", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "To use the given MessageCreatedStrategy which are invoked when  [...]
+    "messageConverter": { "kind": "property", "displayName": "Message Converter", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.springframework.jms.support.converter.MessageConverter", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "To use a custom Spring org.springframework.jms.support.converter.Messag [...]
+    "messageCreatedStrategy": { "kind": "property", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "To use the given MessageCreatedStrategy which are invoked when  [...]
     "messageIdEnabled": { "kind": "property", "displayName": "Message Id Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "When sending, specifies whether message IDs should be added. This is just an hint to the JMS broke [...]
     "messageListenerContainerFactory": { "kind": "property", "displayName": "Message Listener Container Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.MessageListenerContainerFactory", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Registry ID of the MessageListenerC [...]
     "messageTimestampEnabled": { "kind": "property", "displayName": "Message Timestamp Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether timestamps should be enabled by default on sending messages. This  [...]
@@ -106,7 +106,7 @@
     "recoveryInterval": { "kind": "property", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in mil [...]
     "requestTimeoutCheckerInterval": { "kind": "property", "displayName": "Request Timeout Checker Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1000", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Configures how often Camel should check for timed out Exchanges when do [...]
     "synchronous": { "kind": "property", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets whether synchronous processing should be strictly used" },
-    "transferException": { "kind": "property", "displayName": "Transfer Exception", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consu [...]
+    "transferException": { "kind": "property", "displayName": "Transfer Exception", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consu [...]
     "transferExchange": { "kind": "property", "displayName": "Transfer Exchange", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "You can transfer the exchange over the wire instead of just the body and headers. The following fi [...]
     "useMessageIDAsCorrelationID": { "kind": "property", "displayName": "Use Message IDAs Correlation ID", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether JMSMessageID should always be used as JMSCorrelationID  [...]
     "waitForProvisionCorrelationToBeUpdatedCounter": { "kind": "property", "displayName": "Wait For Provision Correlation To Be Updated Counter", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 50, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Number of times to wait for provisional c [...]
@@ -124,19 +124,19 @@
     "transactionTimeout": { "kind": "property", "displayName": "Transaction Timeout", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": -1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The timeout value of the transaction (in seconds), if using transacted mode." }
   },
   "headers": {
-    "CamelJmsDestination": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "javax.jms.Destination", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The destination.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_DESTINATION" },
+    "CamelJmsDestination": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "jakarta.jms.Destination", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The destination.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_DESTINATION" },
     "CamelJmsDestinationName": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The name of the queue or topic to use as destination.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_DESTINATION_NAME" },
     "JMSXGroupID": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS group ID.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_X_GROUP_ID" },
     "JMSMessageID": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS unique message ID.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_MESSAGE_ID" },
     "JMSCorrelationID": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS correlation ID.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_CORRELATION_ID" },
     "JMSCorrelationIDAsBytes": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS correlation ID as bytes.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_CORRELATION_ID_AS_BYTES" },
     "JMSDeliveryMode": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "int", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS delivery mode.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_DELIVERY_MODE" },
-    "JMSDestination": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "javax.jms.Destination", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS destination.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_DESTINATION" },
+    "JMSDestination": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "jakarta.jms.Destination", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS destination.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_DESTINATION" },
     "JMSExpiration": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "long", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS expiration.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_EXPIRATION" },
     "JMSPriority": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "int", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS priority (with 0 as the lowest priority and 9 as the highest).", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_PRIORITY" },
     "JMSRedelivered": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Is the JMS message redelivered.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_REDELIVERED" },
     "JMSTimestamp": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "long", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS timestamp.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_TIMESTAMP" },
-    "JMSReplyTo": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "javax.jms.Destination", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS reply-to destination.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_REPLY_TO" },
+    "JMSReplyTo": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "jakarta.jms.Destination", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS reply-to destination.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_REPLY_TO" },
     "JMSType": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JMS type.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_TYPE" },
     "JMSXUserID": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The XUser id.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_HEADER_XUSER_ID" },
     "CamelJmsMessageType": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "org.apache.camel.component.jms.JmsMessageType", "enum": [ "Bytes", "Map", "Object", "Stream", "Text", "Blob" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The message type.", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_MESSAGE_TYPE" },
@@ -146,10 +146,10 @@
     "destinationType": { "kind": "path", "displayName": "Destination Type", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "queue", "topic", "temp-queue", "temp-topic" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "queue", "description": "The kind of destination to use" },
     "destinationName": { "kind": "path", "displayName": "Destination Name", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Name of the queue or topic to use as destination" },
     "clientId": { "kind": "parameter", "displayName": "Client Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets the JMS client ID to use. Note that this value, if specified, must be unique and can only be used by a single JMS connection instance [...]
-    "connectionFactory": { "kind": "parameter", "displayName": "Connection Factory", "group": "common", "label": "", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The connection factory to be use. A connection factory must be configured either on the component or endpoint." },
+    "connectionFactory": { "kind": "parameter", "displayName": "Connection Factory", "group": "common", "label": "", "required": false, "type": "object", "javaType": "jakarta.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The connection factory to be use. A connection factory must be configured either on the component or endpoint." },
     "disableReplyTo": { "kind": "parameter", "displayName": "Disable Reply To", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back t [...]
     "durableSubscriptionName": { "kind": "parameter", "displayName": "Durable Subscription Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The durable subscriber name for specifying durable topic subscriptions. The clientId option must be configu [...]
-    "jmsMessageType": { "kind": "parameter", "displayName": "Jms Message Type", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.JmsMessageType", "enum": [ "Bytes", "Map", "Object", "Stream", "Text" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows you to force the use of a specifi [...]
+    "jmsMessageType": { "kind": "parameter", "displayName": "Jms Message Type", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.JmsMessageType", "enum": [ "Bytes", "Map", "Object", "Stream", "Text" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows you to force the use of a specifi [...]
     "replyTo": { "kind": "parameter", "displayName": "Reply To", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer)." },
     "testConnectionOnStartup": { "kind": "parameter", "displayName": "Test Connection On Startup", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether to test the connection on startup. This ensures that when Camel starts th [...]
     "acknowledgementModeName": { "kind": "parameter", "displayName": "Acknowledgement Mode Name", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "SESSION_TRANSACTED", "CLIENT_ACKNOWLEDGE", "AUTO_ACKNOWLEDGE", "DUPS_OK_ACKNOWLEDGE" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "AUTO_ACKNOWLEDGE", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationFie [...]
@@ -178,7 +178,7 @@
     "replyToSameDestinationAllowed": { "kind": "parameter", "displayName": "Reply To Same Destination Allowed", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Whether a JMS consumer is allowed to send a repl [...]
     "taskExecutor": { "kind": "parameter", "displayName": "Task Executor", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.springframework.core.task.TaskExecutor", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows you to specify a custom task executor for consuming messages." },
     "deliveryDelay": { "kind": "parameter", "displayName": "Delivery Delay", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": -1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets delivery delay to use for send calls for JMS. This option requires JMS 2.0 compliant broker." },
-    "deliveryMode": { "kind": "parameter", "displayName": "Delivery Mode", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "enum": [ "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryM [...]
+    "deliveryMode": { "kind": "parameter", "displayName": "Delivery Mode", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "enum": [ "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the delivery mode to be used. Possible values are those defined by jakarta.jms.Deliver [...]
     "deliveryPersistent": { "kind": "parameter", "displayName": "Delivery Persistent", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether persistent delivery is used by default." },
     "explicitQosEnabled": { "kind": "parameter", "displayName": "Explicit Qos Enabled", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Set if the deliveryMode, priority or timeToLive qualities of service should be u [...]
     "formatDateHeadersToIso8601": { "kind": "parameter", "displayName": "Format Date Headers To Iso8601", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets whether JMS date properties should be formatted according to the ISO  [...]
@@ -208,16 +208,16 @@
     "asyncStopListener": { "kind": "parameter", "displayName": "Async Stop Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Whether to stop the JmsConsumer message listener asynchronously, when stopping a route." },
     "destinationResolver": { "kind": "parameter", "displayName": "Destination Resolver", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.springframework.jms.support.destination.DestinationResolver", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "A pluggable org.springframework.jms.support.destination.Des [...]
     "errorHandler": { "kind": "parameter", "displayName": "Error Handler", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.springframework.util.ErrorHandler", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions  [...]
-    "exceptionListener": { "kind": "parameter", "displayName": "Exception Listener", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ExceptionListener", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions." },
+    "exceptionListener": { "kind": "parameter", "displayName": "Exception Listener", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.jms.ExceptionListener", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions." },
     "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message." },
     "idleConsumerLimit": { "kind": "parameter", "displayName": "Idle Consumer Limit", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specify the limit for the number of consumers that are allowed to be idle at any given time." },
     "idleTaskExecutionLimit": { "kind": "parameter", "displayName": "Idle Task Execution Limit", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the limit for idle executions of a receive task, not having received any message  [...]
     "includeAllJMSXProperties": { "kind": "parameter", "displayName": "Include All JMSXProperties", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Whether to include all JMSXxxx properties when mapping from JMS to Camel Message [...]
     "jmsKeyFormatStrategy": { "kind": "parameter", "displayName": "Jms Key Format Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.JmsKeyFormatStrategy", "enum": [ "default", "passthrough" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Pluggable strategy for encodi [...]
-    "mapJmsMessage": { "kind": "parameter", "displayName": "Map Jms Message", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should auto map the received JMS message to a suited payload type, such as java [...]
+    "mapJmsMessage": { "kind": "parameter", "displayName": "Map Jms Message", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should auto map the received JMS message to a suited payload type, such as jaka [...]
     "maxMessagesPerTask": { "kind": "parameter", "displayName": "Max Messages Per Task", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": -1, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The number of messages per task. -1 is unlimited. If you use a range for concurrent consumers (eg  [...]
-    "messageConverter": { "kind": "parameter", "displayName": "Message Converter", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.springframework.jms.support.converter.MessageConverter", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "To use a custom Spring org.springframework.jms.support.converter.Messa [...]
-    "messageCreatedStrategy": { "kind": "parameter", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "To use the given MessageCreatedStrategy which are invoked when [...]
+    "messageConverter": { "kind": "parameter", "displayName": "Message Converter", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.springframework.jms.support.converter.MessageConverter", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "To use a custom Spring org.springframework.jms.support.converter.Messa [...]
+    "messageCreatedStrategy": { "kind": "parameter", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "To use the given MessageCreatedStrategy which are invoked when [...]
     "messageIdEnabled": { "kind": "parameter", "displayName": "Message Id Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "When sending, specifies whether message IDs should be added. This is just an hint to the JMS brok [...]
     "messageListenerContainerFactory": { "kind": "parameter", "displayName": "Message Listener Container Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.MessageListenerContainerFactory", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Registry ID of the MessageListener [...]
     "messageTimestampEnabled": { "kind": "parameter", "displayName": "Message Timestamp Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether timestamps should be enabled by default on sending messages. This [...]
@@ -226,7 +226,7 @@
     "recoveryInterval": { "kind": "parameter", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in mi [...]
     "requestTimeoutCheckerInterval": { "kind": "parameter", "displayName": "Request Timeout Checker Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1000", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Configures how often Camel should check for timed out Exchanges when d [...]
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets whether synchronous processing should be strictly used" },
-    "transferException": { "kind": "parameter", "displayName": "Transfer Exception", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the cons [...]
+    "transferException": { "kind": "parameter", "displayName": "Transfer Exception", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the cons [...]
     "transferExchange": { "kind": "parameter", "displayName": "Transfer Exchange", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "You can transfer the exchange over the wire instead of just the body and headers. The following f [...]
     "useMessageIDAsCorrelationID": { "kind": "parameter", "displayName": "Use Message IDAs Correlation ID", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether JMSMessageID should always be used as JMSCorrelationID [...]
     "waitForProvisionCorrelationToBeUpdatedCounter": { "kind": "parameter", "displayName": "Wait For Provision Correlation To Be Updated Counter", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 50, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Number of times to wait for provisional  [...]
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..b5eb277a4c9 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",
@@ -23,7 +23,7 @@
   },
   "componentProperties": {
     "aliases": { "kind": "property", "displayName": "Aliases", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Class<java.lang.Object>>", "deprecated": false, "autowired": false, "secret": false, "description": "Maps an alias to a JPA entity class. The alias can then be used in the endpoint URI (instead of the fully qualified class name)." },
-    "entityManagerFactory": { "kind": "property", "displayName": "Entity Manager Factory", "group": "common", "label": "", "required": false, "type": "object", "javaType": "javax.persistence.EntityManagerFactory", "deprecated": false, "autowired": false, "secret": false, "description": "To use the EntityManagerFactory. This is strongly recommended to configure." },
+    "entityManagerFactory": { "kind": "property", "displayName": "Entity Manager Factory", "group": "common", "label": "", "required": false, "type": "object", "javaType": "jakarta.persistence.EntityManagerFactory", "deprecated": false, "autowired": false, "secret": false, "description": "To use the EntityManagerFactory. This is strongly recommended to configure." },
     "joinTransaction": { "kind": "property", "displayName": "Join Transaction", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "The camel-jpa component will join transaction by default. You can use this option to turn this off, for example if you use LOCAL_RESOURCE and join transaction doesn't work with your JPA provider. This option can also be set [...]
     "sharedEntityManager": { "kind": "property", "displayName": "Shared Entity Manager", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to use Spring's SharedEntityManager for the consumer\/producer. Note in most cases joinTransaction should be set to false as this is not an EXTENDED EntityManager." },
     "transactionManager": { "kind": "property", "displayName": "Transaction Manager", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.springframework.transaction.PlatformTransactionManager", "deprecated": false, "autowired": false, "secret": false, "description": "To use the PlatformTransactionManager for managing transactions." },
@@ -33,7 +33,7 @@
     "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
   },
   "headers": {
-    "CamelEntityManager": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "javax.persistence.EntityManager", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JPA EntityManager object.", "constantName": "org.apache.camel.component.jpa.JpaConstants#ENTITY_MANAGER" },
+    "CamelEntityManager": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "jakarta.persistence.EntityManager", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The JPA EntityManager object.", "constantName": "org.apache.camel.component.jpa.JpaConstants#ENTITY_MANAGER" },
     "CamelJpaParameters": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "Map<String, Object>", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Alternative way for passing query parameters as an Exchange header.", "constantName": "org.apache.camel.component.jpa.JpaConstants#JPA_PARAMETERS_HEADER" }
   },
   "properties": {
@@ -48,7 +48,7 @@
     "consumeDelete": { "kind": "parameter", "displayName": "Consume Delete", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "If true, the entity is deleted after it is consumed; if false, the entity is not deleted." },
     "consumeLockEntity": { "kind": "parameter", "displayName": "Consume Lock Entity", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether or not to set an exclusive lock on each entity bean while processing the results from polling." },
     "deleteHandler": { "kind": "parameter", "displayName": "Delete Handler", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.jpa.DeleteHandler<java.lang.Object>", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom DeleteHandler to delete the row after the consumer is done processing the exchange" },
-    "lockModeType": { "kind": "parameter", "displayName": "Lock Mode Type", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "javax.persistence.LockModeType", "enum": [ "READ", "WRITE", "OPTIMISTIC", "OPTIMISTIC_FORCE_INCREMENT", "PESSIMISTIC_READ", "PESSIMISTIC_WRITE", "PESSIMISTIC_FORCE_INCREMENT", "NONE" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "PESSIMISTIC_WRITE", "description": "To configure the lock mode  [...]
+    "lockModeType": { "kind": "parameter", "displayName": "Lock Mode Type", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "jakarta.persistence.LockModeType", "enum": [ "READ", "WRITE", "OPTIMISTIC", "OPTIMISTIC_FORCE_INCREMENT", "PESSIMISTIC_READ", "PESSIMISTIC_WRITE", "PESSIMISTIC_FORCE_INCREMENT", "NONE" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "PESSIMISTIC_WRITE", "description": "To configure the lock mod [...]
     "maxMessagesPerPoll": { "kind": "parameter", "displayName": "Max Messages Per Poll", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "An integer value to define the maximum number of messages to gather per poll. By default, no maximum is set. Can be used to avoid polling many thousands of messages when starting up the server. Set a value of 0 or negative to disa [...]
     "preDeleteHandler": { "kind": "parameter", "displayName": "Pre Delete Handler", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.jpa.DeleteHandler<java.lang.Object>", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom Pre-DeleteHandler to delete the row after the consumer has read the entity." },
     "sendEmptyMessageWhenIdle": { "kind": "parameter", "displayName": "Send Empty Message When Idle", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead." },
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 fc2d73c458b..42d2b950a5e 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 e305c4343bb..45f0cc6d857 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..b13433190f3 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",
@@ -33,7 +33,7 @@
     "handleFailedMessage": { "kind": "property", "displayName": "Handle Failed Message", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "If the mail consumer cannot retrieve a given mail message, then th [...]
     "mimeDecodeHeaders": { "kind": "property", "displayName": "Mime Decode Headers", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "This option enables transparent MIME decoding and unfolding for mail h [...]
     "moveTo": { "kind": "property", "displayName": "Move To", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "After processing a mail message, it can be moved to a mail folder with the given name. You can override this [...]
-    "peek": { "kind": "property", "displayName": "Peek", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Will mark the javax.mail.Message as peeked before processing the mail message. This applies to IMAP [...]
+    "peek": { "kind": "property", "displayName": "Peek", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Will mark the jakarta.mail.Message as peeked before processing the mail message. This applies to IM [...]
     "skipFailedMessage": { "kind": "property", "displayName": "Skip Failed Message", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "If the mail consumer cannot retrieve a given mail message, then this o [...]
     "unseen": { "kind": "property", "displayName": "Unseen", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to limit by unseen mails only." },
     "failOnDuplicateFileAttachment": { "kind": "property", "displayName": "Fail On Duplicate File Attachment", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to fail processing the mail if the mail [...]
@@ -41,7 +41,7 @@
     "folderName": { "kind": "property", "displayName": "Folder Name", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "INBOX", "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The folder to poll." },
     "generateMissingAttachmentNames": { "kind": "property", "displayName": "Generate Missing Attachment Names", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Set this to 'uuid' to set a UUID for the filename of the atta [...]
     "handleDuplicateAttachmentNames": { "kind": "property", "displayName": "Handle Duplicate Attachment Names", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Set the strategy to handle duplicate filenames of attachments [...]
-    "mapMailMessage": { "kind": "property", "displayName": "Map Mail Message", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should map the received mail message to Camel body\/head [...]
+    "mapMailMessage": { "kind": "property", "displayName": "Map Mail Message", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should map the received mail message to Camel body\/head [...]
     "bcc": { "kind": "property", "displayName": "Bcc", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the BCC email address. Separate multiple email addresses with comma." },
     "cc": { "kind": "property", "displayName": "Cc", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the CC email address. Separate multiple email addresses with comma." },
     "from": { "kind": "property", "displayName": "From", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "camel@localhost", "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The from email address" },
@@ -63,7 +63,7 @@
     "ignoreUnsupportedCharset": { "kind": "property", "displayName": "Ignore Unsupported Charset", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending ma [...]
     "ignoreUriScheme": { "kind": "property", "displayName": "Ignore Uri Scheme", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the charse [...]
     "javaMailProperties": { "kind": "property", "displayName": "Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the java mail options. Will clear any default properties and only use the properties provided for [...]
-    "session": { "kind": "property", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.mail.Session", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are created  [...]
+    "session": { "kind": "property", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.mail.Session", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are create [...]
     "useInlineAttachments": { "kind": "property", "displayName": "Use Inline Attachments", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to use disposition inline or attachment." },
     "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." },
     "password": { "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The password for login. See also setAuthenticator(MailAuthenticator)." },
@@ -96,7 +96,7 @@
     "maxMessagesPerPoll": { "kind": "parameter", "displayName": "Max Messages Per Poll", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the maximum number of messages to gather per poll. By default, no maximum is set. Can be used to set a limit of e.g. 1000 to avoid downloading thousands of files when the server starts up. Set a value of 0 or negative to [...]
     "mimeDecodeHeaders": { "kind": "parameter", "displayName": "Mime Decode Headers", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "This option enables transparent MIME decoding and unfolding for mail  [...]
     "moveTo": { "kind": "parameter", "displayName": "Move To", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "After processing a mail message, it can be moved to a mail folder with the given name. You can override thi [...]
-    "peek": { "kind": "parameter", "displayName": "Peek", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Will mark the javax.mail.Message as peeked before processing the mail message. This applies to IMA [...]
+    "peek": { "kind": "parameter", "displayName": "Peek", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Will mark the jakarta.mail.Message as peeked before processing the mail message. This applies to I [...]
     "sendEmptyMessageWhenIdle": { "kind": "parameter", "displayName": "Send Empty Message When Idle", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead." },
     "skipFailedMessage": { "kind": "parameter", "displayName": "Skip Failed Message", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "If the mail consumer cannot retrieve a given mail message, then this  [...]
     "unseen": { "kind": "parameter", "displayName": "Unseen", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to limit by unseen mails only." },
@@ -109,7 +109,7 @@
     "generateMissingAttachmentNames": { "kind": "parameter", "displayName": "Generate Missing Attachment Names", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Set this to 'uuid' to set a UUID for the filename of the att [...]
     "handleDuplicateAttachmentNames": { "kind": "parameter", "displayName": "Handle Duplicate Attachment Names", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Set the strategy to handle duplicate filenames of attachment [...]
     "mailUidGenerator": { "kind": "parameter", "displayName": "Mail Uid Generator", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.MailUidGenerator", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable MailUidGenerator that allows to use custom logic to generate UUID of the mail message." },
-    "mapMailMessage": { "kind": "parameter", "displayName": "Map Mail Message", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should map the received mail message to Camel body\/hea [...]
+    "mapMailMessage": { "kind": "parameter", "displayName": "Map Mail Message", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should map the received mail message to Camel body\/hea [...]
     "pollStrategy": { "kind": "parameter", "displayName": "Poll Strategy", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.PollingConsumerPollStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation  [...]
     "postProcessAction": { "kind": "parameter", "displayName": "Post Process Action", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.MailBoxPostProcessAction", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to an MailBoxPostProcessAction for doing post processing tasks on the mailbox once the normal processing ended." },
     "bcc": { "kind": "parameter", "displayName": "Bcc", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the BCC email address. Separate multiple email addresses with comma." },
@@ -133,11 +133,11 @@
     "ignoreUnsupportedCharset": { "kind": "parameter", "displayName": "Ignore Unsupported Charset", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending m [...]
     "ignoreUriScheme": { "kind": "parameter", "displayName": "Ignore Uri Scheme", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the chars [...]
     "javaMailProperties": { "kind": "parameter", "displayName": "Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the java mail options. Will clear any default properties and only use the properties provided fo [...]
-    "session": { "kind": "parameter", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.mail.Session", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are created [...]
+    "session": { "kind": "parameter", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.mail.Session", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are creat [...]
     "useInlineAttachments": { "kind": "parameter", "displayName": "Use Inline Attachments", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to use disposition inline or attachment." },
     "idempotentRepository": { "kind": "parameter", "displayName": "Idempotent Repository", "group": "filter", "label": "consumer,filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.IdempotentRepository", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable repository org.apache.camel.spi.IdempotentRepository which allows to cluster consuming from the same mailbox, and let the repository coordinate whether a mail message is vali [...]
     "idempotentRepositoryRemoveOnCommit": { "kind": "parameter", "displayName": "Idempotent Repository Remove On Commit", "group": "filter", "label": "consumer,filter", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "When using idempotent repository, then when the mail message has been successfully processed and is committed, should the message id be removed from the idempotent re [...]
-    "searchTerm": { "kind": "parameter", "displayName": "Search Term", "group": "filter", "label": "consumer,filter", "required": false, "type": "object", "javaType": "javax.mail.search.SearchTerm", "prefix": "searchTerm.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "description": "Refers to a javax.mail.search.SearchTerm which allows to filter mails based on search criteria such as subject, body, from, sent after a certain date etc." },
+    "searchTerm": { "kind": "parameter", "displayName": "Search Term", "group": "filter", "label": "consumer,filter", "required": false, "type": "object", "javaType": "jakarta.mail.search.SearchTerm", "prefix": "searchTerm.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "description": "Refers to a jakarta.mail.search.SearchTerm which allows to filter mails based on search criteria such as subject, body, from, sent after a certain date etc." },
     "backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." },
     "backoffIdleThreshold": { "kind": "parameter", "displayName": "Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." },
     "backoffMultiplier": { "kind": "parameter", "displayName": "Backoff Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening agai [...]
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..39d6c4c8f40 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",
@@ -33,7 +33,7 @@
     "handleFailedMessage": { "kind": "property", "displayName": "Handle Failed Message", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "If the mail consumer cannot retrieve a given mail message, then th [...]
     "mimeDecodeHeaders": { "kind": "property", "displayName": "Mime Decode Headers", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "This option enables transparent MIME decoding and unfolding for mail h [...]
     "moveTo": { "kind": "property", "displayName": "Move To", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "After processing a mail message, it can be moved to a mail folder with the given name. You can override this [...]
-    "peek": { "kind": "property", "displayName": "Peek", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Will mark the javax.mail.Message as peeked before processing the mail message. This applies to IMAP [...]
+    "peek": { "kind": "property", "displayName": "Peek", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Will mark the jakarta.mail.Message as peeked before processing the mail message. This applies to IM [...]
     "skipFailedMessage": { "kind": "property", "displayName": "Skip Failed Message", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "If the mail consumer cannot retrieve a given mail message, then this o [...]
     "unseen": { "kind": "property", "displayName": "Unseen", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to limit by unseen mails only." },
     "failOnDuplicateFileAttachment": { "kind": "property", "displayName": "Fail On Duplicate File Attachment", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to fail processing the mail if the mail [...]
@@ -41,7 +41,7 @@
     "folderName": { "kind": "property", "displayName": "Folder Name", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "INBOX", "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The folder to poll." },
     "generateMissingAttachmentNames": { "kind": "property", "displayName": "Generate Missing Attachment Names", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Set this to 'uuid' to set a UUID for the filename of the atta [...]
     "handleDuplicateAttachmentNames": { "kind": "property", "displayName": "Handle Duplicate Attachment Names", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Set the strategy to handle duplicate filenames of attachments [...]
-    "mapMailMessage": { "kind": "property", "displayName": "Map Mail Message", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should map the received mail message to Camel body\/head [...]
+    "mapMailMessage": { "kind": "property", "displayName": "Map Mail Message", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should map the received mail message to Camel body\/head [...]
     "bcc": { "kind": "property", "displayName": "Bcc", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the BCC email address. Separate multiple email addresses with comma." },
     "cc": { "kind": "property", "displayName": "Cc", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the CC email address. Separate multiple email addresses with comma." },
     "from": { "kind": "property", "displayName": "From", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "camel@localhost", "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The from email address" },
@@ -63,7 +63,7 @@
     "ignoreUnsupportedCharset": { "kind": "property", "displayName": "Ignore Unsupported Charset", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending ma [...]
     "ignoreUriScheme": { "kind": "property", "displayName": "Ignore Uri Scheme", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the charse [...]
     "javaMailProperties": { "kind": "property", "displayName": "Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the java mail options. Will clear any default properties and only use the properties provided for [...]
-    "session": { "kind": "property", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.mail.Session", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are created  [...]
+    "session": { "kind": "property", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.mail.Session", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are create [...]
     "useInlineAttachments": { "kind": "property", "displayName": "Use Inline Attachments", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to use disposition inline or attachment." },
     "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." },
     "password": { "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The password for login. See also setAuthenticator(MailAuthenticator)." },
@@ -96,7 +96,7 @@
     "maxMessagesPerPoll": { "kind": "parameter", "displayName": "Max Messages Per Poll", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the maximum number of messages to gather per poll. By default, no maximum is set. Can be used to set a limit of e.g. 1000 to avoid downloading thousands of files when the server starts up. Set a value of 0 or negative to [...]
     "mimeDecodeHeaders": { "kind": "parameter", "displayName": "Mime Decode Headers", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "This option enables transparent MIME decoding and unfolding for mail  [...]
     "moveTo": { "kind": "parameter", "displayName": "Move To", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "After processing a mail message, it can be moved to a mail folder with the given name. You can override thi [...]
-    "peek": { "kind": "parameter", "displayName": "Peek", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Will mark the javax.mail.Message as peeked before processing the mail message. This applies to IMA [...]
+    "peek": { "kind": "parameter", "displayName": "Peek", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Will mark the jakarta.mail.Message as peeked before processing the mail message. This applies to I [...]
     "sendEmptyMessageWhenIdle": { "kind": "parameter", "displayName": "Send Empty Message When Idle", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead." },
     "skipFailedMessage": { "kind": "parameter", "displayName": "Skip Failed Message", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "If the mail consumer cannot retrieve a given mail message, then this  [...]
     "unseen": { "kind": "parameter", "displayName": "Unseen", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to limit by unseen mails only." },
@@ -109,7 +109,7 @@
     "generateMissingAttachmentNames": { "kind": "parameter", "displayName": "Generate Missing Attachment Names", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Set this to 'uuid' to set a UUID for the filename of the att [...]
     "handleDuplicateAttachmentNames": { "kind": "parameter", "displayName": "Handle Duplicate Attachment Names", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Set the strategy to handle duplicate filenames of attachment [...]
     "mailUidGenerator": { "kind": "parameter", "displayName": "Mail Uid Generator", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.MailUidGenerator", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable MailUidGenerator that allows to use custom logic to generate UUID of the mail message." },
-    "mapMailMessage": { "kind": "parameter", "displayName": "Map Mail Message", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should map the received mail message to Camel body\/hea [...]
+    "mapMailMessage": { "kind": "parameter", "displayName": "Map Mail Message", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should map the received mail message to Camel body\/hea [...]
     "pollStrategy": { "kind": "parameter", "displayName": "Poll Strategy", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.PollingConsumerPollStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation  [...]
     "postProcessAction": { "kind": "parameter", "displayName": "Post Process Action", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.MailBoxPostProcessAction", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to an MailBoxPostProcessAction for doing post processing tasks on the mailbox once the normal processing ended." },
     "bcc": { "kind": "parameter", "displayName": "Bcc", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the BCC email address. Separate multiple email addresses with comma." },
@@ -133,11 +133,11 @@
     "ignoreUnsupportedCharset": { "kind": "parameter", "displayName": "Ignore Unsupported Charset", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending m [...]
     "ignoreUriScheme": { "kind": "parameter", "displayName": "Ignore Uri Scheme", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the chars [...]
     "javaMailProperties": { "kind": "parameter", "displayName": "Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the java mail options. Will clear any default properties and only use the properties provided fo [...]
-    "session": { "kind": "parameter", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.mail.Session", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are created [...]
+    "session": { "kind": "parameter", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.mail.Session", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are creat [...]
     "useInlineAttachments": { "kind": "parameter", "displayName": "Use Inline Attachments", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to use disposition inline or attachment." },
     "idempotentRepository": { "kind": "parameter", "displayName": "Idempotent Repository", "group": "filter", "label": "consumer,filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.IdempotentRepository", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable repository org.apache.camel.spi.IdempotentRepository which allows to cluster consuming from the same mailbox, and let the repository coordinate whether a mail message is vali [...]
     "idempotentRepositoryRemoveOnCommit": { "kind": "parameter", "displayName": "Idempotent Repository Remove On Commit", "group": "filter", "label": "consumer,filter", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "When using idempotent repository, then when the mail message has been successfully processed and is committed, should the message id be removed from the idempotent re [...]
-    "searchTerm": { "kind": "parameter", "displayName": "Search Term", "group": "filter", "label": "consumer,filter", "required": false, "type": "object", "javaType": "javax.mail.search.SearchTerm", "prefix": "searchTerm.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "description": "Refers to a javax.mail.search.SearchTerm which allows to filter mails based on search criteria such as subject, body, from, sent after a certain date etc." },
+    "searchTerm": { "kind": "parameter", "displayName": "Search Term", "group": "filter", "label": "consumer,filter", "required": false, "type": "object", "javaType": "jakarta.mail.search.SearchTerm", "prefix": "searchTerm.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "description": "Refers to a jakarta.mail.search.SearchTerm which allows to filter mails based on search criteria such as subject, body, from, sent after a certain date etc." },
     "backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." },
     "backoffIdleThreshold": { "kind": "parameter", "displayName": "Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." },
     "backoffMultiplier": { "kind": "parameter", "displayName": "Backoff Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening agai [...]
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..96f5da4bf53 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",
@@ -76,7 +76,7 @@
     "async": { "kind": "parameter", "displayName": "Async", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Configure the consumer to work in async mode" },
     "httpMethodRestrict": { "kind": "parameter", "displayName": "Http Method Restrict", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Used to only allow consuming if the HttpMethod matches, such as GET\/POST\/PUT etc. Multiple methods can be specified separated by comma." },
     "muteException": { "kind": "parameter", "displayName": "Mute Exception", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If enabled and an Exchange failed processing on the consumer side the response's body won't contain the exception's stack trace." },
-    "responseBufferSize": { "kind": "parameter", "displayName": "Response Buffer Size", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom buffer size on the javax.servlet.ServletResponse." },
+    "responseBufferSize": { "kind": "parameter", "displayName": "Response Buffer Size", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom buffer size on the jakarta.servlet.ServletResponse." },
     "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now [...]
     "eagerCheckContentAvailable": { "kind": "parameter", "displayName": "Eager Check Content Available", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to eager check whether the HTTP requests has content if the content-length header is 0 or not present. This can be turned on in case HTTP clients do not send s [...]
     "exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
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/rocketmq.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rocketmq.json
index ed2629825c3..5335774d24c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rocketmq.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rocketmq.json
@@ -11,7 +11,7 @@
     "supportLevel": "Preview",
     "groupId": "org.apache.camel",
     "artifactId": "camel-rocketmq",
-    "version": "3.20.0-SNAPSHOT",
+    "version": "4.0.0-SNAPSHOT",
     "scheme": "rocketmq",
     "extendsScheme": "",
     "syntax": "rocketmq:topicName",
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..aa52f3e328d 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",
@@ -45,7 +45,7 @@
     "httpMethodRestrict": { "kind": "parameter", "displayName": "Http Method Restrict", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Used to only allow consuming if the HttpMethod matches, such as GET\/POST\/PUT etc. Multiple methods can be specified separated by comma." },
     "matchOnUriPrefix": { "kind": "parameter", "displayName": "Match On Uri Prefix", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether or not the consumer should try to find a target consumer by matching the URI prefix if no exact match is found." },
     "muteException": { "kind": "parameter", "displayName": "Mute Exception", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If enabled and an Exchange failed processing on the consumer side the response's body won't contain the exception's stack trace." },
-    "responseBufferSize": { "kind": "parameter", "displayName": "Response Buffer Size", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom buffer size on the javax.servlet.ServletResponse." },
+    "responseBufferSize": { "kind": "parameter", "displayName": "Response Buffer Size", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom buffer size on the jakarta.servlet.ServletResponse." },
     "servletName": { "kind": "parameter", "displayName": "Servlet Name", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "CamelServlet", "description": "Name of the servlet to use" },
     "transferException": { "kind": "parameter", "displayName": "Transfer Exception", "group": "consumer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If enabled and an Exchange failed processing on the consumer side, and if the caused Exception was send back serialized in the response as a application\/x-java-serialized-object content type. On the producer side t [...]
     "attachmentMultipartBinding": { "kind": "parameter", "displayName": "Attachment Multipart Binding", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to automatic bind multipart\/form-data as attachments on the Camel Exchange. The options attachmentMultipartBinding=true and disableStreamCache=false cannot wor [...]
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 012405bb5ed..a21c45b06df 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..7b69d8bed94 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",
@@ -22,14 +22,14 @@
     "lenientProperties": false
   },
   "componentProperties": {
-    "connectionFactory": { "kind": "property", "displayName": "Connection Factory", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": true, "secret": false, "description": "The connection factory to be use. A connection factory must be configured either on the component or endpoint." },
+    "connectionFactory": { "kind": "property", "displayName": "Connection Factory", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "jakarta.jms.ConnectionFactory", "deprecated": false, "autowired": true, "secret": false, "description": "The connection factory to be use. A connection factory must be configured either on the component or endpoint." },
     "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a me [...]
     "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...]
     "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
     "destinationCreationStrategy": { "kind": "property", "displayName": "Destination Creation Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.DestinationCreationStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom DestinationCreationStrategy." },
-    "exceptionListener": { "kind": "property", "displayName": "Exception Listener", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ExceptionListener", "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions." },
+    "exceptionListener": { "kind": "property", "displayName": "Exception Listener", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.jms.ExceptionListener", "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions." },
     "jmsKeyFormatStrategy": { "kind": "property", "displayName": "Jms Key Format Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides one implementation out of the box: default. The defau [...]
-    "messageCreatedStrategy": { "kind": "property", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use the given MessageCreatedStrategy which are invoked when Camel creates new instances of javax.jms.Message objects when Camel is sending a JMS message." },
+    "messageCreatedStrategy": { "kind": "property", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use the given MessageCreatedStrategy which are invoked when Camel creates new instances of jakarta.jms.Message objects when Camel is sending a JMS message." },
     "recoveryInterval": { "kind": "property", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds." },
     "replyToOnTimeoutMaxConcurrentConsumers": { "kind": "property", "displayName": "Reply To On Timeout Max Concurrent Consumers", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Specifies the maximum number of concurrent consumers for continue routing when timeout occurred when using request\/reply over JMS." },
     "requestTimeoutCheckerInterval": { "kind": "property", "displayName": "Request Timeout Checker Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1000", "description": "Configures how often Camel should check for timed out Exchanges when doing request\/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeou [...]
@@ -45,7 +45,7 @@
     "destinationType": { "kind": "path", "displayName": "Destination Type", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "queue", "topic" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "queue", "description": "The kind of destination to use" },
     "destinationName": { "kind": "path", "displayName": "Destination Name", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "DestinationName is a JMS queue or topic name. By default, the destinationName is interpreted as a queue name." },
     "acknowledgementMode": { "kind": "parameter", "displayName": "Acknowledgement Mode", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.SessionAcknowledgementType", "enum": [ "SESSION_TRANSACTED", "CLIENT_ACKNOWLEDGE", "AUTO_ACKNOWLEDGE", "DUPS_OK_ACKNOWLEDGE" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "AUTO_ACKNOWLEDGE", "description": "The JMS acknowledgement name, which is one of:  [...]
-    "connectionFactory": { "kind": "parameter", "displayName": "Connection Factory", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "description": "The connection factory to be use. A connection factory must be configured either on the component or endpoint." },
+    "connectionFactory": { "kind": "parameter", "displayName": "Connection Factory", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "jakarta.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "description": "The connection factory to be use. A connection factory must be configured either on the component or endpoint." },
     "disableReplyTo": { "kind": "parameter", "displayName": "Disable Reply To", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from  [...]
     "replyTo": { "kind": "parameter", "displayName": "Reply To", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer)." },
     "testConnectionOnStartup": { "kind": "parameter", "displayName": "Test Connection On Startup", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel [...]
@@ -62,7 +62,7 @@
     "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
     "messageSelector": { "kind": "parameter", "displayName": "Message Selector", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the JMS Message selector syntax." },
     "replyToSameDestinationAllowed": { "kind": "parameter", "displayName": "Reply To Same Destination Allowed", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether a JMS consumer is allowed to send a reply message to the same destination that the consumer is using to consume from. This prevents an endless loop by c [...]
-    "deliveryMode": { "kind": "parameter", "displayName": "Delivery Mode", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "enum": [ "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2." },
+    "deliveryMode": { "kind": "parameter", "displayName": "Delivery Mode", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "enum": [ "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the delivery mode to be used. Possible values are those defined by jakarta.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2." },
     "deliveryPersistent": { "kind": "parameter", "displayName": "Delivery Persistent", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether persistent delivery is used by default." },
     "priority": { "kind": "parameter", "displayName": "Priority", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "enum": [ "1", "2", "3", "4", "5", "6", "7", "8", "9" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": 4, "description": "Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in orde [...]
     "replyToConcurrentConsumers": { "kind": "parameter", "displayName": "Reply To Concurrent Consumers", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Specifies the default number of concurrent consumers when doing request\/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up\/down of threads." },
@@ -78,15 +78,15 @@
     "asyncStartListener": { "kind": "parameter", "displayName": "Async Start Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and\/o [...]
     "asyncStopListener": { "kind": "parameter", "displayName": "Async Stop Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to stop the consumer message listener asynchronously, when stopping a route." },
     "destinationCreationStrategy": { "kind": "parameter", "displayName": "Destination Creation Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.DestinationCreationStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom DestinationCreationStrategy." },
-    "exceptionListener": { "kind": "parameter", "displayName": "Exception Listener", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ExceptionListener", "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions." },
+    "exceptionListener": { "kind": "parameter", "displayName": "Exception Listener", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.jms.ExceptionListener", "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions." },
     "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message." },
     "includeAllJMSXProperties": { "kind": "parameter", "displayName": "Include All JMSXProperties", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to include all JMSXxxx properties when mapping from JMS to Camel Message. Setting this to true will include properties such as JMSXAppID, and JMSXUserID etc. Note: If you are using a c [...]
     "jmsKeyFormatStrategy": { "kind": "parameter", "displayName": "Jms Key Format Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides two implementations out of the box: default and pass [...]
-    "mapJmsMessage": { "kind": "parameter", "displayName": "Map Jms Message", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether Camel should auto map the received JMS message to a suited payload type, such as javax.jms.TextMessage to a String etc. See section about how mapping works below for more details." },
-    "messageCreatedStrategy": { "kind": "parameter", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use the given MessageCreatedStrategy which are invoked when Camel creates new instances of javax.jms.Message objects when Camel is sending a JMS message." },
+    "mapJmsMessage": { "kind": "parameter", "displayName": "Map Jms Message", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether Camel should auto map the received JMS message to a suited payload type, such as jakarta.jms.TextMessage to a String etc. See section about how mapping works below for more details." },
+    "messageCreatedStrategy": { "kind": "parameter", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use the given MessageCreatedStrategy which are invoked when Camel creates new instances of jakarta.jms.Message objects when Camel is sending a JMS message." },
     "recoveryInterval": { "kind": "parameter", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds." },
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether synchronous processing should be strictly used" },
-    "transferException": { "kind": "parameter", "displayName": "Transfer Exception", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client i [...]
+    "transferException": { "kind": "parameter", "displayName": "Transfer Exception", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a jakarta.jms.ObjectMessage. If the client [...]
     "transacted": { "kind": "parameter", "displayName": "Transacted", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether to use transacted mode" }
   }
 }
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..cf924965542 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",
@@ -22,14 +22,14 @@
     "lenientProperties": false
   },
   "componentProperties": {
-    "connectionFactory": { "kind": "property", "displayName": "Connection Factory", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": true, "secret": false, "description": "The connection factory to be use. A connection factory must be configured either on the component or endpoint." },
+    "connectionFactory": { "kind": "property", "displayName": "Connection Factory", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "jakarta.jms.ConnectionFactory", "deprecated": false, "autowired": true, "secret": false, "description": "The connection factory to be use. A connection factory must be configured either on the component or endpoint." },
     "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a me [...]
     "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...]
     "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
     "destinationCreationStrategy": { "kind": "property", "displayName": "Destination Creation Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.DestinationCreationStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom DestinationCreationStrategy." },
-    "exceptionListener": { "kind": "property", "displayName": "Exception Listener", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ExceptionListener", "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions." },
+    "exceptionListener": { "kind": "property", "displayName": "Exception Listener", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.jms.ExceptionListener", "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions." },
     "jmsKeyFormatStrategy": { "kind": "property", "displayName": "Jms Key Format Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides one implementation out of the box: default. The defau [...]
-    "messageCreatedStrategy": { "kind": "property", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use the given MessageCreatedStrategy which are invoked when Camel creates new instances of javax.jms.Message objects when Camel is sending a JMS message." },
+    "messageCreatedStrategy": { "kind": "property", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use the given MessageCreatedStrategy which are invoked when Camel creates new instances of jakarta.jms.Message objects when Camel is sending a JMS message." },
     "recoveryInterval": { "kind": "property", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds." },
     "replyToOnTimeoutMaxConcurrentConsumers": { "kind": "property", "displayName": "Reply To On Timeout Max Concurrent Consumers", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Specifies the maximum number of concurrent consumers for continue routing when timeout occurred when using request\/reply over JMS." },
     "requestTimeoutCheckerInterval": { "kind": "property", "displayName": "Request Timeout Checker Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1000", "description": "Configures how often Camel should check for timed out Exchanges when doing request\/reply over JMS. By default Camel checks once per second. But if you must react faster when a timeou [...]
@@ -45,7 +45,7 @@
     "destinationType": { "kind": "path", "displayName": "Destination Type", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "queue", "topic" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "queue", "description": "The kind of destination to use" },
     "destinationName": { "kind": "path", "displayName": "Destination Name", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "DestinationName is a JMS queue or topic name. By default, the destinationName is interpreted as a queue name." },
     "acknowledgementMode": { "kind": "parameter", "displayName": "Acknowledgement Mode", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.SessionAcknowledgementType", "enum": [ "SESSION_TRANSACTED", "CLIENT_ACKNOWLEDGE", "AUTO_ACKNOWLEDGE", "DUPS_OK_ACKNOWLEDGE" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "AUTO_ACKNOWLEDGE", "description": "The JMS acknowledgement name, which is one of:  [...]
-    "connectionFactory": { "kind": "parameter", "displayName": "Connection Factory", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "javax.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "description": "The connection factory to be use. A connection factory must be configured either on the component or endpoint." },
+    "connectionFactory": { "kind": "parameter", "displayName": "Connection Factory", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "jakarta.jms.ConnectionFactory", "deprecated": false, "autowired": false, "secret": false, "description": "The connection factory to be use. A connection factory must be configured either on the component or endpoint." },
     "disableReplyTo": { "kind": "parameter", "displayName": "Disable Reply To", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether Camel ignores the JMSReplyTo header in messages. If true, Camel does not send a reply back to the destination specified in the JMSReplyTo header. You can use this option if you want Camel to consume from  [...]
     "replyTo": { "kind": "parameter", "displayName": "Reply To", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Provides an explicit ReplyTo destination (overrides any incoming value of Message.getJMSReplyTo() in consumer)." },
     "testConnectionOnStartup": { "kind": "parameter", "displayName": "Test Connection On Startup", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether to test the connection on startup. This ensures that when Camel starts that all the JMS consumers have a valid connection to the JMS broker. If a connection cannot be granted then Camel [...]
@@ -65,7 +65,7 @@
     "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
     "messageSelector": { "kind": "parameter", "displayName": "Message Selector", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the JMS Message selector syntax." },
     "replyToSameDestinationAllowed": { "kind": "parameter", "displayName": "Reply To Same Destination Allowed", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether a JMS consumer is allowed to send a reply message to the same destination that the consumer is using to consume from. This prevents an endless loop by c [...]
-    "deliveryMode": { "kind": "parameter", "displayName": "Delivery Mode", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "enum": [ "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the delivery mode to be used. Possible values are those defined by javax.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2." },
+    "deliveryMode": { "kind": "parameter", "displayName": "Delivery Mode", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "enum": [ "1", "2" ], "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the delivery mode to be used. Possible values are those defined by jakarta.jms.DeliveryMode. NON_PERSISTENT = 1 and PERSISTENT = 2." },
     "deliveryPersistent": { "kind": "parameter", "displayName": "Delivery Persistent", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether persistent delivery is used by default." },
     "priority": { "kind": "parameter", "displayName": "Priority", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "enum": [ "1", "2", "3", "4", "5", "6", "7", "8", "9" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": 4, "description": "Values greater than 1 specify the message priority when sending (where 1 is the lowest priority and 9 is the highest). The explicitQosEnabled option must also be enabled in orde [...]
     "replyToConcurrentConsumers": { "kind": "parameter", "displayName": "Reply To Concurrent Consumers", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1, "description": "Specifies the default number of concurrent consumers when doing request\/reply over JMS. See also the maxMessagesPerTask option to control dynamic scaling up\/down of threads." },
@@ -81,15 +81,15 @@
     "asyncStartListener": { "kind": "parameter", "displayName": "Async Start Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to startup the consumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and\/o [...]
     "asyncStopListener": { "kind": "parameter", "displayName": "Async Stop Listener", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to stop the consumer message listener asynchronously, when stopping a route." },
     "destinationCreationStrategy": { "kind": "parameter", "displayName": "Destination Creation Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.DestinationCreationStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom DestinationCreationStrategy." },
-    "exceptionListener": { "kind": "parameter", "displayName": "Exception Listener", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.jms.ExceptionListener", "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions." },
+    "exceptionListener": { "kind": "parameter", "displayName": "Exception Listener", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.jms.ExceptionListener", "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions." },
     "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message." },
     "includeAllJMSXProperties": { "kind": "parameter", "displayName": "Include All JMSXProperties", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to include all JMSXxxx properties when mapping from JMS to Camel Message. Setting this to true will include properties such as JMSXAppID, and JMSXUserID etc. Note: If you are using a c [...]
     "jmsKeyFormatStrategy": { "kind": "parameter", "displayName": "Jms Key Format Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "Pluggable strategy for encoding and decoding JMS keys so they can be compliant with the JMS specification. Camel provides two implementations out of the box: default and pass [...]
-    "mapJmsMessage": { "kind": "parameter", "displayName": "Map Jms Message", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether Camel should auto map the received JMS message to a suited payload type, such as javax.jms.TextMessage to a String etc. See section about how mapping works below for more details." },
-    "messageCreatedStrategy": { "kind": "parameter", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use the given MessageCreatedStrategy which are invoked when Camel creates new instances of javax.jms.Message objects when Camel is sending a JMS message." },
+    "mapJmsMessage": { "kind": "parameter", "displayName": "Map Jms Message", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Specifies whether Camel should auto map the received JMS message to a suited payload type, such as jakarta.jms.TextMessage to a String etc. See section about how mapping works below for more details." },
+    "messageCreatedStrategy": { "kind": "parameter", "displayName": "Message Created Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.sjms.jms.MessageCreatedStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use the given MessageCreatedStrategy which are invoked when Camel creates new instances of jakarta.jms.Message objects when Camel is sending a JMS message." },
     "recoveryInterval": { "kind": "parameter", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds." },
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether synchronous processing should be strictly used" },
-    "transferException": { "kind": "parameter", "displayName": "Transfer Exception", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a javax.jms.ObjectMessage. If the client i [...]
+    "transferException": { "kind": "parameter", "displayName": "Transfer Exception", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If enabled and you are using Request Reply messaging (InOut) and an Exchange failed on the consumer side, then the caused Exception will be send back in response as a jakarta.jms.ObjectMessage. If the client [...]
     "transacted": { "kind": "parameter", "displayName": "Transacted", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Specifies whether to use transacted mode" }
   }
 }
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..d8fd3831339 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",
@@ -33,7 +33,7 @@
     "handleFailedMessage": { "kind": "property", "displayName": "Handle Failed Message", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "If the mail consumer cannot retrieve a given mail message, then th [...]
     "mimeDecodeHeaders": { "kind": "property", "displayName": "Mime Decode Headers", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "This option enables transparent MIME decoding and unfolding for mail h [...]
     "moveTo": { "kind": "property", "displayName": "Move To", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "After processing a mail message, it can be moved to a mail folder with the given name. You can override this [...]
-    "peek": { "kind": "property", "displayName": "Peek", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Will mark the javax.mail.Message as peeked before processing the mail message. This applies to IMAP [...]
+    "peek": { "kind": "property", "displayName": "Peek", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Will mark the jakarta.mail.Message as peeked before processing the mail message. This applies to IM [...]
     "skipFailedMessage": { "kind": "property", "displayName": "Skip Failed Message", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "If the mail consumer cannot retrieve a given mail message, then this o [...]
     "unseen": { "kind": "property", "displayName": "Unseen", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to limit by unseen mails only." },
     "failOnDuplicateFileAttachment": { "kind": "property", "displayName": "Fail On Duplicate File Attachment", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to fail processing the mail if the mail [...]
@@ -41,7 +41,7 @@
     "folderName": { "kind": "property", "displayName": "Folder Name", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "INBOX", "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The folder to poll." },
     "generateMissingAttachmentNames": { "kind": "property", "displayName": "Generate Missing Attachment Names", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Set this to 'uuid' to set a UUID for the filename of the atta [...]
     "handleDuplicateAttachmentNames": { "kind": "property", "displayName": "Handle Duplicate Attachment Names", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Set the strategy to handle duplicate filenames of attachments [...]
-    "mapMailMessage": { "kind": "property", "displayName": "Map Mail Message", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should map the received mail message to Camel body\/head [...]
+    "mapMailMessage": { "kind": "property", "displayName": "Map Mail Message", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should map the received mail message to Camel body\/head [...]
     "bcc": { "kind": "property", "displayName": "Bcc", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the BCC email address. Separate multiple email addresses with comma." },
     "cc": { "kind": "property", "displayName": "Cc", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the CC email address. Separate multiple email addresses with comma." },
     "from": { "kind": "property", "displayName": "From", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "camel@localhost", "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The from email address" },
@@ -63,7 +63,7 @@
     "ignoreUnsupportedCharset": { "kind": "property", "displayName": "Ignore Unsupported Charset", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending ma [...]
     "ignoreUriScheme": { "kind": "property", "displayName": "Ignore Uri Scheme", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the charse [...]
     "javaMailProperties": { "kind": "property", "displayName": "Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the java mail options. Will clear any default properties and only use the properties provided for [...]
-    "session": { "kind": "property", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.mail.Session", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are created  [...]
+    "session": { "kind": "property", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.mail.Session", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are create [...]
     "useInlineAttachments": { "kind": "property", "displayName": "Use Inline Attachments", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to use disposition inline or attachment." },
     "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." },
     "password": { "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The password for login. See also setAuthenticator(MailAuthenticator)." },
@@ -96,7 +96,7 @@
     "maxMessagesPerPoll": { "kind": "parameter", "displayName": "Max Messages Per Poll", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the maximum number of messages to gather per poll. By default, no maximum is set. Can be used to set a limit of e.g. 1000 to avoid downloading thousands of files when the server starts up. Set a value of 0 or negative to [...]
     "mimeDecodeHeaders": { "kind": "parameter", "displayName": "Mime Decode Headers", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "This option enables transparent MIME decoding and unfolding for mail  [...]
     "moveTo": { "kind": "parameter", "displayName": "Move To", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "After processing a mail message, it can be moved to a mail folder with the given name. You can override thi [...]
-    "peek": { "kind": "parameter", "displayName": "Peek", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Will mark the javax.mail.Message as peeked before processing the mail message. This applies to IMA [...]
+    "peek": { "kind": "parameter", "displayName": "Peek", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Will mark the jakarta.mail.Message as peeked before processing the mail message. This applies to I [...]
     "sendEmptyMessageWhenIdle": { "kind": "parameter", "displayName": "Send Empty Message When Idle", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead." },
     "skipFailedMessage": { "kind": "parameter", "displayName": "Skip Failed Message", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "If the mail consumer cannot retrieve a given mail message, then this  [...]
     "unseen": { "kind": "parameter", "displayName": "Unseen", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to limit by unseen mails only." },
@@ -109,7 +109,7 @@
     "generateMissingAttachmentNames": { "kind": "parameter", "displayName": "Generate Missing Attachment Names", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Set this to 'uuid' to set a UUID for the filename of the att [...]
     "handleDuplicateAttachmentNames": { "kind": "parameter", "displayName": "Handle Duplicate Attachment Names", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Set the strategy to handle duplicate filenames of attachment [...]
     "mailUidGenerator": { "kind": "parameter", "displayName": "Mail Uid Generator", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.MailUidGenerator", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable MailUidGenerator that allows to use custom logic to generate UUID of the mail message." },
-    "mapMailMessage": { "kind": "parameter", "displayName": "Map Mail Message", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should map the received mail message to Camel body\/hea [...]
+    "mapMailMessage": { "kind": "parameter", "displayName": "Map Mail Message", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should map the received mail message to Camel body\/hea [...]
     "pollStrategy": { "kind": "parameter", "displayName": "Poll Strategy", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.PollingConsumerPollStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation  [...]
     "postProcessAction": { "kind": "parameter", "displayName": "Post Process Action", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.MailBoxPostProcessAction", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to an MailBoxPostProcessAction for doing post processing tasks on the mailbox once the normal processing ended." },
     "bcc": { "kind": "parameter", "displayName": "Bcc", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the BCC email address. Separate multiple email addresses with comma." },
@@ -133,11 +133,11 @@
     "ignoreUnsupportedCharset": { "kind": "parameter", "displayName": "Ignore Unsupported Charset", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending m [...]
     "ignoreUriScheme": { "kind": "parameter", "displayName": "Ignore Uri Scheme", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the chars [...]
     "javaMailProperties": { "kind": "parameter", "displayName": "Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the java mail options. Will clear any default properties and only use the properties provided fo [...]
-    "session": { "kind": "parameter", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.mail.Session", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are created [...]
+    "session": { "kind": "parameter", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.mail.Session", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are creat [...]
     "useInlineAttachments": { "kind": "parameter", "displayName": "Use Inline Attachments", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to use disposition inline or attachment." },
     "idempotentRepository": { "kind": "parameter", "displayName": "Idempotent Repository", "group": "filter", "label": "consumer,filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.IdempotentRepository", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable repository org.apache.camel.spi.IdempotentRepository which allows to cluster consuming from the same mailbox, and let the repository coordinate whether a mail message is vali [...]
     "idempotentRepositoryRemoveOnCommit": { "kind": "parameter", "displayName": "Idempotent Repository Remove On Commit", "group": "filter", "label": "consumer,filter", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "When using idempotent repository, then when the mail message has been successfully processed and is committed, should the message id be removed from the idempotent re [...]
-    "searchTerm": { "kind": "parameter", "displayName": "Search Term", "group": "filter", "label": "consumer,filter", "required": false, "type": "object", "javaType": "javax.mail.search.SearchTerm", "prefix": "searchTerm.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "description": "Refers to a javax.mail.search.SearchTerm which allows to filter mails based on search criteria such as subject, body, from, sent after a certain date etc." },
+    "searchTerm": { "kind": "parameter", "displayName": "Search Term", "group": "filter", "label": "consumer,filter", "required": false, "type": "object", "javaType": "jakarta.mail.search.SearchTerm", "prefix": "searchTerm.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "description": "Refers to a jakarta.mail.search.SearchTerm which allows to filter mails based on search criteria such as subject, body, from, sent after a certain date etc." },
     "backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." },
     "backoffIdleThreshold": { "kind": "parameter", "displayName": "Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." },
     "backoffMultiplier": { "kind": "parameter", "displayName": "Backoff Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening agai [...]
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..5fe26d6cf01 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",
@@ -33,7 +33,7 @@
     "handleFailedMessage": { "kind": "property", "displayName": "Handle Failed Message", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "If the mail consumer cannot retrieve a given mail message, then th [...]
     "mimeDecodeHeaders": { "kind": "property", "displayName": "Mime Decode Headers", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "This option enables transparent MIME decoding and unfolding for mail h [...]
     "moveTo": { "kind": "property", "displayName": "Move To", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "After processing a mail message, it can be moved to a mail folder with the given name. You can override this [...]
-    "peek": { "kind": "property", "displayName": "Peek", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Will mark the javax.mail.Message as peeked before processing the mail message. This applies to IMAP [...]
+    "peek": { "kind": "property", "displayName": "Peek", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Will mark the jakarta.mail.Message as peeked before processing the mail message. This applies to IM [...]
     "skipFailedMessage": { "kind": "property", "displayName": "Skip Failed Message", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "If the mail consumer cannot retrieve a given mail message, then this o [...]
     "unseen": { "kind": "property", "displayName": "Unseen", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to limit by unseen mails only." },
     "failOnDuplicateFileAttachment": { "kind": "property", "displayName": "Fail On Duplicate File Attachment", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to fail processing the mail if the mail [...]
@@ -41,7 +41,7 @@
     "folderName": { "kind": "property", "displayName": "Folder Name", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "INBOX", "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The folder to poll." },
     "generateMissingAttachmentNames": { "kind": "property", "displayName": "Generate Missing Attachment Names", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Set this to 'uuid' to set a UUID for the filename of the atta [...]
     "handleDuplicateAttachmentNames": { "kind": "property", "displayName": "Handle Duplicate Attachment Names", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Set the strategy to handle duplicate filenames of attachments [...]
-    "mapMailMessage": { "kind": "property", "displayName": "Map Mail Message", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should map the received mail message to Camel body\/head [...]
+    "mapMailMessage": { "kind": "property", "displayName": "Map Mail Message", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should map the received mail message to Camel body\/head [...]
     "bcc": { "kind": "property", "displayName": "Bcc", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the BCC email address. Separate multiple email addresses with comma." },
     "cc": { "kind": "property", "displayName": "Cc", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the CC email address. Separate multiple email addresses with comma." },
     "from": { "kind": "property", "displayName": "From", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "camel@localhost", "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The from email address" },
@@ -63,7 +63,7 @@
     "ignoreUnsupportedCharset": { "kind": "property", "displayName": "Ignore Unsupported Charset", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending ma [...]
     "ignoreUriScheme": { "kind": "property", "displayName": "Ignore Uri Scheme", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the charse [...]
     "javaMailProperties": { "kind": "property", "displayName": "Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the java mail options. Will clear any default properties and only use the properties provided for [...]
-    "session": { "kind": "property", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.mail.Session", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are created  [...]
+    "session": { "kind": "property", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.mail.Session", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are create [...]
     "useInlineAttachments": { "kind": "property", "displayName": "Use Inline Attachments", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to use disposition inline or attachment." },
     "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." },
     "password": { "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The password for login. See also setAuthenticator(MailAuthenticator)." },
@@ -96,7 +96,7 @@
     "maxMessagesPerPoll": { "kind": "parameter", "displayName": "Max Messages Per Poll", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "Specifies the maximum number of messages to gather per poll. By default, no maximum is set. Can be used to set a limit of e.g. 1000 to avoid downloading thousands of files when the server starts up. Set a value of 0 or negative to [...]
     "mimeDecodeHeaders": { "kind": "parameter", "displayName": "Mime Decode Headers", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "This option enables transparent MIME decoding and unfolding for mail  [...]
     "moveTo": { "kind": "parameter", "displayName": "Move To", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "After processing a mail message, it can be moved to a mail folder with the given name. You can override thi [...]
-    "peek": { "kind": "parameter", "displayName": "Peek", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Will mark the javax.mail.Message as peeked before processing the mail message. This applies to IMA [...]
+    "peek": { "kind": "parameter", "displayName": "Peek", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Will mark the jakarta.mail.Message as peeked before processing the mail message. This applies to I [...]
     "sendEmptyMessageWhenIdle": { "kind": "parameter", "displayName": "Send Empty Message When Idle", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead." },
     "skipFailedMessage": { "kind": "parameter", "displayName": "Skip Failed Message", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "If the mail consumer cannot retrieve a given mail message, then this  [...]
     "unseen": { "kind": "parameter", "displayName": "Unseen", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to limit by unseen mails only." },
@@ -109,7 +109,7 @@
     "generateMissingAttachmentNames": { "kind": "parameter", "displayName": "Generate Missing Attachment Names", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Set this to 'uuid' to set a UUID for the filename of the att [...]
     "handleDuplicateAttachmentNames": { "kind": "parameter", "displayName": "Handle Duplicate Attachment Names", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Set the strategy to handle duplicate filenames of attachment [...]
     "mailUidGenerator": { "kind": "parameter", "displayName": "Mail Uid Generator", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.MailUidGenerator", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable MailUidGenerator that allows to use custom logic to generate UUID of the mail message." },
-    "mapMailMessage": { "kind": "parameter", "displayName": "Map Mail Message", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should map the received mail message to Camel body\/hea [...]
+    "mapMailMessage": { "kind": "parameter", "displayName": "Map Mail Message", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies whether Camel should map the received mail message to Camel body\/hea [...]
     "pollStrategy": { "kind": "parameter", "displayName": "Poll Strategy", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.PollingConsumerPollStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation  [...]
     "postProcessAction": { "kind": "parameter", "displayName": "Post Process Action", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.mail.MailBoxPostProcessAction", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to an MailBoxPostProcessAction for doing post processing tasks on the mailbox once the normal processing ended." },
     "bcc": { "kind": "parameter", "displayName": "Bcc", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the BCC email address. Separate multiple email addresses with comma." },
@@ -133,11 +133,11 @@
     "ignoreUnsupportedCharset": { "kind": "parameter", "displayName": "Ignore Unsupported Charset", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending m [...]
     "ignoreUriScheme": { "kind": "parameter", "displayName": "Ignore Uri Scheme", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Option to let Camel ignore unsupported charset in the local JVM when sending mails. If the chars [...]
     "javaMailProperties": { "kind": "parameter", "displayName": "Java Mail Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Sets the java mail options. Will clear any default properties and only use the properties provided fo [...]
-    "session": { "kind": "parameter", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.mail.Session", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are created [...]
+    "session": { "kind": "parameter", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "jakarta.mail.Session", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Specifies the mail session that camel should use for all mail interactions. Useful in scenarios where mail sessions are creat [...]
     "useInlineAttachments": { "kind": "parameter", "displayName": "Use Inline Attachments", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "Whether to use disposition inline or attachment." },
     "idempotentRepository": { "kind": "parameter", "displayName": "Idempotent Repository", "group": "filter", "label": "consumer,filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.IdempotentRepository", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable repository org.apache.camel.spi.IdempotentRepository which allows to cluster consuming from the same mailbox, and let the repository coordinate whether a mail message is vali [...]
     "idempotentRepositoryRemoveOnCommit": { "kind": "parameter", "displayName": "Idempotent Repository Remove On Commit", "group": "filter", "label": "consumer,filter", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "When using idempotent repository, then when the mail message has been successfully processed and is committed, should the message id be removed from the idempotent re [...]
-    "searchTerm": { "kind": "parameter", "displayName": "Search Term", "group": "filter", "label": "consumer,filter", "required": false, "type": "object", "javaType": "javax.mail.search.SearchTerm", "prefix": "searchTerm.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "description": "Refers to a javax.mail.search.SearchTerm which allows to filter mails based on search criteria such as subject, body, from, sent after a certain date etc." },
+    "searchTerm": { "kind": "parameter", "displayName": "Search Term", "group": "filter", "label": "consumer,filter", "required": false, "type": "object", "javaType": "jakarta.mail.search.SearchTerm", "prefix": "searchTerm.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "description": "Refers to a jakarta.mail.search.SearchTerm which allows to filter mails based on search criteria such as subject, body, from, sent after a certain date etc." },
     "backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." },
     "backoffIdleThreshold": { "kind": "parameter", "displayName": "Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." },
     "backoffMultiplier": { "kind": "parameter", "displayName": "Backoff Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening agai [...]
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 9d4283165b2..00b1a21f716 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",
... 69631 lines suppressed ...


[camel] 02/05: Reenable git commands

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 3a81853ed1c5dd130f87168efcd0fa00b48c1468
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Thu Dec 8 14:01:19 2022 +0100

    Reenable git commands
---
 jakarta/rewrite.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/jakarta/rewrite.java b/jakarta/rewrite.java
index bc55ad48238..a8232d0f842 100755
--- a/jakarta/rewrite.java
+++ b/jakarta/rewrite.java
@@ -33,9 +33,10 @@ class rewrite implements Callable<Integer> {
     @Override
     public Integer call() throws Exception {
         // Rebase on top of main
-        // exec("git", "checkout", "jakarta-rewrite");
+        exec("git", "checkout", "jakarta/rewrite");
+        exec("git", "rebase", "origin/main");
         // Create/reset branch 'rewritten'
-        // exec("git", "checkout", "-B", "jakarta-rewritten", "jakarta-rewrite");
+        exec("git", "checkout", "-B", "jakarta/rewritten", "jakarta/rewrite");
 
         // Switch version to 4.0.0-SNAPSHOT
         System.out.println("Switch version to 4.0.0-SNAPSHOT");