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 2023/01/02 12:10:25 UTC

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

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 a675d5ffa58 Fix salesforce component
 discard d28f20c2e7f Migration to Jetty 11
 discard 67ecb1ad247 Switch to jakarta namespace
 discard 3a81853ed1c Reenable git commands
 discard ef2a60f00a5 Rewrite script
     add 7585f1f458b Upgrade AWS SDK v2 to version 2.18.36
     add 5e8106de5d4 Sync deps
     add 73b211a3301 (chores) documentation: minor formatting fix
     add 17639df6646 (chores) documentation: minor rework of the adding routes text
     add d55f5472339 CAMEL-18748: camel-yaml-dsl - error-handler should be aligned to camel-core-model to be consistent.
     add 25af89869d5 Polished camel-yaml-dsl docs
     add b69371587fe CAMEL-18748: camel-yaml-dsl - error-handler should be aligned to camel-core-model to be consistent.
     add 9f7ee94d94e CAMEL-18748: camel-yaml-dsl - error-handler should be aligned to camel-core-model to be consistent.
     add b796f8537ac CAMEL-18748: camel-yaml-dsl - error-handler should be aligned to camel-core-model to be consistent.
     add 0af7fba24cd Upgrade to Netty 4.1.86
     add 0e3084b58c6 Upgrade to vert.x 4.3.6
     add b5fc32b4734 CAMEL-18748: camel-yaml-dsl - error-handler should be aligned to camel-core-model to be consistent.
     add b688e68cb0a (chores) documentation: rework the context documentation
     add 92fb53a5bad (chores) documentation: removed outdated info about CamelTemplate
     add 3c7f0123fe7 (chores) documentation: added link to the CamelContext reference
     add 292283af110 (chores) documentation: reworked the component section on the getting started
     add 33432372861 (chores) documentation: moved additional component details to the component page
     add 08e013e80b7 (chores) documentation: formatting fixes
     add f89c5edab5e Update camel-jbang.adoc (#8891)
     add 497a339f4d5 CAMEL-18809: RouteDefinitionHelper should resolve the intercepted from URI which is configured with property placeholder (#8888)
     add 25476491cf3 (chores) documentation: reworked the message/exchange section on the getting started
     add 4f77cabf2b7 (chores) documentation: reworked the processor section on the getting started
     add 9e1aa2e5142 (chores) documentation: reworked the Java DSL section on the getting started
     add 8c60453a6cc (chores) documentation: reworked the Continue Learning about Camel section on the getting started
     add c21e7cca99d Upgrade woodstox-core to 6.4.0 (#8893)
     add de736998021 Upgrade commons-net to 3.9.0 (#8894)
     add e0fcdaa6f0d Upgrade kafka-clients (#8895)
     add cdb0bfc5221 Bump cxf-core from 3.5.4 to 3.5.5 in /parent (#8897)
     add adcb8a3bb8a Update hbase to 2.5.2 (#8898)
     add bc64f733c59 Update sshd-version to 2.9.2 (#8899)
     add 30cf0717da0 Regen
     add 4f7ff1ba5ba Upgrade AWS SDK v2 to version 2.18.38
     add 0f45b0059fd Sync deps
     add 18e8b5e4e28 (chores) documentation: fixed incorrect header level
     add fbab0bc1f0b CAMEL-18811: camel-ldap - InvalidSearchFilterException: invalid attribute description
     add 489a66c2abe [Hyperledger-Aries] Add support for service=present-proof/send-proposal (#8901)
     add 78ec812707d Polished
     add 3ea0740370b camel-ldap - Add docs about LDAP injection
     add 384df4dbc05 CAMEL-18812 Fix REST DSL configuration placeholder for id
     add b759c75b8cb Fix REST DSL configuration placeholder for id (#8902)
     add b7f45b1fd60 Regen for commit b759c75b8cb4edbb289bf3ef9d70fe2fc6fd8e53
     add 913c1cd5898 CAMEL-18739: camel-core - AggregationStrategy onCompletion to have access to input exchange.
     add 25c6941b8f1 CAMEL-18812 Fix REST DSL configuration placeholder for id
     add c7902015232 CAMEL-18739: camel-core - AggregationStrategy onCompletion to have access to input exchange.
     add 29b55273dc6 CAMEL-18739 fix by handing over the completion to the original exchange (#8795)
     add d08b7b380af CAMEL-18739 fix by handing over the completion to the original exchange (#8795)
     add 6acb68e1adf CAMEL-18739 fix by handing over the completion to the original exchange (#8795)
     add f99c22e5355 CAMEL-16262 fixed automaticRetriesDisabled option setting in http component (#8904)
     add 6ea0f1c93dc CAMEL-18817: camel-hbase - Support append and increment operations in the producer (#8905)
     add 40b4cd8a4cd Polished
     add a8a8ce89fff CAMEL-18812 Fix REST DSL configuration placeholder for id
     add d5cdd93a536 Upgrade to couchbase 3.4.1 (#8906)
     add 7acabbc3612 Upgrade AWS SDK v2 to version 2.18.39
     add e8b41431fb7 Sync deps
     add 7c6d6731745 Upgrade Optaplanner to version 8.31.1.Final
     add 561f0e3d6c6 Sync deps
     add f36b6d52106 Upgrade MongoDB Driver Core to version 4.8.1
     add 005028a8963 Sync deps
     add 2febd6b010b Added a note about MongoDB upgrade to driver 4.8.x
     add 96dc63528b3 CAMEL-18773 - Added back a note about Google Pubsub headers renaming
     add 80785269105 Use latest container image for Hashicorp Vault 1.12.2
     add 413b76f42a0 camel-jbang - Upgrade redshift
     add c69a9300f74 CAMEL-18819 hbase: excluded audience-annotations from zookeeper (#8908)
     add b8460586fa7 CAMEL-18819 hbase: excluded audience-annotations from zookeeper (#8908)
     add 8043dd38e92 upgrade opentelemetry to the version 1.21.0
     add 25641597e51 upgrade to azure-sdk-bom version 1.2.8
     add 64c11904ae0 correct typo
     add 39aea8576ed Upgrade to kubernetes client 6.3.1 (#8909)
     add 7658f2f2601 Regen
     add a84aa1de331 Upgrade reactor-core 3.4.26
     add 93e9de19ad0 Upgrade reactor-netty 1.0.26
     add fc1f9217418 Upgrade AWS SDK v2 to version 2.18.40
     add f5ed9ac2505 Sync deps
     add ca1ccd50a35 Upgrade to jetty 9.4.50
     add 002c9ca5824 CAMEL-18661: Make span current and clear scope properly for async processing (#8713)
     add ae253277680 CAMEL-18661: clean-ups
     add e5899213a4c enable tests by FromJmsToJdbcIdempotentConsumerToJms(Xa)Test and observe them on jenkins
     add 11e7b57926d cleanup tests after enabling by the previous commit
     add c7e09490a86 polish tests
     add 6dcb9bf169b polish logger
     add abbdf389981 Polished
     add deb264c61bc camel-jbang - Polsished
     add 343319ff302 CAMEL-18815: camel-jbang - Base package scan to search in downloaded JARs
     add 95351e385ff Regen for commit 343319ff302eed55894c85cb16888553795c698a
     add 7a4f42aa443 Polished
     add 6c7d0c84b4a Make XmlHelper more secure
     add ecabb7c2ef1 Add missing descriptions to some options in route for XML DSL
     add 3bc3c10998d fix the checkstyle violation
     add 59acd09b551 Regen for commit ecabb7c2ef147bd56afd48691460e2e8448e3caa
     add c9018877654 CAMEL-18823: camel-jbang - Add dependency copy command.
     add 45545409076 Upgrade maven-dependency-plugin to 3.4.0
     add eb527b5f7b2 Upgrade Kudu to 1.16.0 (#8919)
     add 31276cc4d86 CAMEL-18827: camel-kudu - Fix unit test failure with JDK 17 (#8920)
     add 57e868ab5cb CAMEL-18825: Make XmlHelper more secure
     add 5db23502f13 CAMEL-18825: Make XmlHelper more secure
     add 3b12e488b52 CAMEL-18825: Make XmlHelper more secure
     add 34a6c8466ee Upgrade AWS SDK v2 to version 2.18.41
     add 36e5bd99c09 Sync deps
     add 4bdc6f14cc2 CAMEL-18826: camel-kudu - Install libtinfo on CI to execute all Kudu's unit tests (#8918)
     add 3a3ff1717e1 CAMEL-18825: Make XmlHelper more secure
     add 4e2797a02bd CAMEL-18825: Make XmlHelper more secure
     add 97477331359 CAMEL-18825: Make XmlHelper more secure
     add 35538a67c46 CAMEL-18828: camel-kudu - Add DELETE, UPDATE, and UPSERT support to the producer (#8921)
     add 77b514e5e6f CAMEL-18825: Make XmlHelper more secure
     add 2459ba1dd36 CAMEL-18131 - camel-health - Add health checks for components that has extension for connectivity verification - ECS
     add 4ba5f73f0f9 CAMEL-18131 - camel-health - Add health checks for components that has extension for connectivity verification - ECS
     add 28524f07d1b CAMEL-18131 - camel-health - Add health checks for components that has extension for connectivity verification - ECS
     add f7e1efab3e7 CAMEL-18131 - camel-health - Add health checks for components that has extension for connectivity verification - ECS
     add 3bea1de9bdb CAMEL-18131 - camel-health - Add health checks for components that has extension for connectivity verification - ECS
     add 898c8bdf2e5 CAMEL-18131 - camel-health - Add health checks for components that has extension for connectivity verification - ECS
     add 660ef4a9865 CAMEL-18131 - camel-health - Add health checks for components that has extension for connectivity verification - ECS
     add 5c2d133e862 CAMEL-18131 - camel-health - Add health checks for components that has extension for connectivity verification - ECS
     add 79a04b328f6 Regen for commit 4e2797a02bd381fd3574e569ff0e3cc29181f5d5
     add 282e4bc3e84 Regen for commit 9747733135980b8eacc4003fe7dd13c4a0daf5f4 (#8923)
     add 0fb20d9de05 Regen for commit 77b514e5e6f2fa088cd3918b1cd1e3099046aaaf
     add 5e24101aa99 CAMEL-18828 (addendum): camel-kudu - Update the component reference (#8924)
     add 7bda1236434 CAMEL-18752: camel-micrometer - Include description of metrics
     add d7d527f49c5 camel-salesforce: Doc fix.
     add be02b1fd2e3 CAMEL-18829: camel-yaml-dsl - generate-yaml-schema - Support `additionalProperties: false` (#8928)
     add 7dc1602d104 (chores) replace size() > 0 by !isEmpty() (#8929)
     add cd8e115d316 CAMEL-18830: camel-ehcache - Align to JAXB from camel
     add 5f3eab353c2 CAMEL-18659: camel-openapi-java - Add support for nullable defined on model classes via @Schema for openapi v3
     add a32f094fbde CAMEL-18825: Make XmlHelper more secure
     add 4af605e9c27 Upgrade to spring security 5.8.1
     add efd8ea3f779 Upgrade spring rabbitmq 2.4.8
     add e7949a0292c Upgrade AWS SDK v2 to version 2.19.0
     add 77ef9c8f659 Sync deps
     add 4a88914fa17 CAMEL-18831: camel-xstream - Deprecated
     add e284028d91a Upgrade to Artemis 2.17.1
     add bbc0f083afc camel-jbang - Fix potential NPE
     add fd987b602c2 camel-jbang - Show version for catalog other
     add f90ede4372d Polished
     add 2acb10b986f Regen for commit 4a88914fa177b92366b3dfd854a67358afbe5fd2 (#8930)
     add aec5958309c Upgrade Infinispan to version 14.0.4.Final
     add 27f4e903859 Upgrade Infinispan Container image to the latest version 14.0.4.Final-1
     add 197291e0978 Sync deps
     add c856ed12eea Upgrade Infinispan Container image to the latest version 14.0.4.Final, no need for -1 suffix since it's an alias
     add b4cc760eb11 (chores) More of replace size() > 0 by !isEmpty() (#8931)
     add e10666bbd11 (chores) Lasts sonar issues about replace size() > 0 by !isEmpty() (#8935)
     add 2e1cc4f5ed3 Tracing: fix flaky test and add scope checks before closing (#8934)
     add 965fd2841d1 CAMEL-18832: camel-spring-boot - Health Check output should include data in full exposure level. Aligned output to be similar to microprofile-health.
     add 1eace8b17c0 Update to latest swagger-codegen-maven-plugin
     add 0c5af54712d Upgrade AWS SDK v2 to version 2.19.1
     add fcf42724de1 Sync deps
     add 96aeb775019 Set version to 3.21.0-SNAPSHOT
     add f54c89e322c Regen for commit 96aeb775019210934f7585cb9cd81f4a268cf421
     add 3914bc0f28b Regen for commit f54c89e322cd3eb0a6c77eb295006f13d8ebfd06 (#8938)
     add 17ecae446ce Regen
     add 309ce7ec89d Polished
     add cdf3283f3ca Regen for commit 17ecae446cee4ede8dc559c5886afcf5a3d6281a
     add 2201292d10e camel-jbang - Upgrade to Camel 3.20.0 (#8914)
     add 67acbd90411 camel-jbang - Upgrade to latest quarkus for export
     add 6a107fe1b66 Upgrade AWS SDK v2 to version 2.19.2
     add 40321de6d29 Sync deps
     add f52be8cf411 Upgrade Optaplanner to version 8.32.0.Final
     add d9851ad09c1 Sync deps
     add 41406645820 Upgrade Http Core to version 4.4.16
     add a3b6e8aaf1e Upgrade Http Client to version 4.5.16
     add 6cd2a9c25d6 Sync deps
     add e26a94c3e35 CAMEL-18834: camel-core - StringQuoteHelper should remove quotes for … (#8941)
     add 569149dd77e Polished
     add 5b73eba46d3 CAMEL-18665: Document default resource type change.
     add fb609ed80f7 Fix spelling mistake (#8942)
     add 8738cb71bc3 CAMEL-18839: Upgrade to Kafka 3.3.1 (#8943)
     add cf3f70e20bc CAMEL-18839: camel-kafka - Upgrade to newer kafka images for camel-test-infra-kafka
     add 90273983b08 camel-wal - Fix docs
     add 29fe8707348 camel-wal - Fix docs
     add b14ba22e275 [CAMEL-15111] Fixes bug in camel-as2 via not forcing ascii charset when not specified (#8944)
     add f7fdb7d483c CAMEL-15111: Move as2-lib to parent
     add 4c7d6c51523 camel-jbang - Upgrade to kamelets 3.20.0
     add 51b44036065 CAMEL-18835: OnCompletionProcessor#onFailure callback fires more than once
     add 358077fce57 [CAMEL-18842] Checks for compression before throwing exception (#8947)
     add 611aa8600c0 CAMEL-18825: Make XML parser/transformers more secure out of the box.
     add 9cb1ff41560 CAMEL-18825: Make XML parser/transformers more secure out of the box.
     add fc717898b4b Upgrade libphonenumber 8.13.3
     add 628a1622666 CAMEL-18825: Make XML parser/transformers more secure out of the box.
     add e59b22c3cb1 CAMEL-18825: Make XML parser/transformers more secure out of the box.
     add 0a860de26ea CAMEL-18825: Make XML parser/transformers more secure out of the box.
     add 0c9e8ff16d5 xstream upgrade to 1.4.20
     add 0bc10ee6139 CAMEL-18825: Make XML parser/transformers more secure out of the box.
     add 7d021193271 CAMEL-18825: Make XML parser/transformers more secure out of the box.
     add 1cbf2b6f457 docs: camel-kafka - Enumerate all options for compressionCodec (#8948)
     add e0aaa73b977 Regen for commit 1cbf2b6f457c74842e7ff843cc3908e1fc969caf
     add 9b6dc2e3bba Regen for commit e0aaa73b9778990c2e19f2d8d6ef4130f0b5d56a
     add 796e58cd27a Spring doc minor fix.
     add b05f0ff3dd6 Revert "Spring doc minor fix."
     add 2f91f34b187 Polished
     add d9276e9aed5 Upgrade to groovy 3.0.14
     add b2887077019 Polished
     add 0b2b8a746b1 fix the misspelled kabooms
     add ebdd2044911 polish test
     add 2b1566aa16e camel-yaml-dsl - Suppress PMD warning in source generated code
     add eadb8db368a Fix code scanning low warning: Exceptions should not be thrown from servlet methods
     add 4e0e191dbf4 Code scanning. Avoid logging value in type-converter
     add d97910e5611 CAMEL-18825: Make XML parser/transformers more secure out of the box.
     add d972b6b67ca correct typo
     add 43586526137 Polished
     add bc7b56e5315 Polished
     add b1328b93258 Upgrade dependencies as part of spring boot 2.7.7 upgrade
     add c3be90c709e CAMEL-18843: upgrade to spring boot 2.7.7
     add 61e0b903fee CAMEL-18825: Make XML parser/transformers more secure out of the box.
     add 9bd7acd73f5 CAMEL-18840: camel-http - Make followRedirects=true|false easier to use and no need for tweaking other options.
     add af10819178b Regen for commit 9bd7acd73f5ae0acfac4763570b4a5c252e989e3
     add 4e0eb2dfc0e CAMEL-18825: Make XML parser/transformers more secure out of the box.
     add 853c2509fbd fix route reload with unassigned route ids
     add 0764caccd21 Fix code scanning low warning: Exceptions should not be thrown from servlet methods
     add 0ddef8d51c0 Fix code scanning low warning: Exceptions should not be thrown from servlet methods
     add 07a66cf4b0c CAMEL-18844: Possible memory leak in org.apache.camel.impl.console.EventConsole
     add f48bfbe953e camel-console - Is not recommended for production use.
     add b4015dbeb9e Regen for commit f48bfbe953e765e559f022603ab4aa231164699e (#8953)
     add 217b99ee562 CAMEL-18844: Possible memory leak in org.apache.camel.impl.console.EventConsole
     add 2abf8e8ad45 CAMEL-18845: camel-core - Performance overhead for async processing event emitting that is not needed usually
     add 7f7e2d392fd CAMEL-18845: camel-core - Performance overhead for async processing event emitting that is not needed usually
     add ddd5a37cfb0 CAMEL-18846: camel-main - Performance overhead due to emitting events not needed
     add 3be04f0044f Regen for commit ddd5a37cfb0139d10de17bcab9c1b705e052ebdd (#8954)
     add 594290e3924 CAMEL-18844: Fix event console performance degration on high concurrent load due to internal locking. It is okay to not use concurrent queue and instead just a basic array with moving cursor - its okay if an event is overridden.
     add ce2fa0bef38 CAMEL-18844: Fix event console performance degration on high concurrent load due to internal locking.
     add ce91dad9689 CAMEL-18847: Move AbstractDevConsole from camel-console to camel-support. So components with console plugins does not automatic include and enable dev consoles.
     add 7fc4686ef21 Regen for commit ce91dad96892165371feb5bd53fef5e7cf2eaa89
     add 177600e1892 CAMEL-18840: camel-http - Make followRedirects=true|false easier to use and no need for tweaking other options.
     add 27fd30638fb camel-http - Better label on options
     add fd7be4ff35d Regen for commit 27fd30638fbde9efb9fb736c708929e5f004ab5e
     add a402137c84e Regen for commit fd7be4ff35d3ac721c4583e6b9874f8611ca8d51
     add 95f492b75c2 Escape # to display it properly
     add 28f4ae0d94a CAMEL-18848: camel-core-model - Rest DSL allowedValues should use definition model for value
     add ed1c0b5019c CAMEL-18848: camel-core-model - Rest DSL allowedValues should use definition model for value
     add 30f081daf5f CAMEL-18848: camel-core-model - Rest DSL allowedValues should use definition model for value
     add e0669037499 CAMEL-18850: camel-core-model - @XmlAttributes should be String or Enum type only
     add 1f8700a7334 Regen for commit e06690374992b807ebf5b9d4c2747df0988b26d8
     add 57c58d6ae18 CAMEL-18850: camel-core-model - @XmlAttributes should be String or Enum type only
     add 428e49451c5 Regen for commit 57c58d6ae18c3d2f2732b746e081d29930ae0804
     add 3f7068e4773 fix typo in reactive-streams-component.adoc
     add 8a417a296e8 Upgrade AWS SDK v2 to version 2.19.8
     add 2b123c90bde Sync deps
     add 93943814cce CAMEL-18850: camel-core-model - @XmlAttributes should be String or Enum type only
     add 1c08fc777a9 Regen for commit 93943814cce92d053e9fbdcd426d81b33e4c45a4
     add 37c952d645b build tooling - Should not change support level for versions when changing x.y.z (z digit).
     add 821959a6556 Upgrade to apache 29 parent
     add 93d71b6e803 CAMEL-18841: camel-kafka: producer idempotence is not enabled by default
     new 76ea1ee2fe3 Rewrite script
     new 82e5b8ca3f9 Reenable git commands
     new d853f18e738 Fix jetty cherry-pick
     new 804b6928db9 Use cxf 4.0.0
     new 38f632e9045 Switch to jakarta namespace
     new ecf5b389384 Migration to Jetty 11
     new b9dcb8d941f Fix salesforce component
     new 2057ec98083 Regen

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

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

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

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


Summary of changes:
 .github/actions/install-packages/action.yml        |   26 +
 .github/workflows/pr-build.yml                     |    2 +
 apache-camel/pom.xml                               |    2 +-
 archetypes/camel-archetype-api-component/pom.xml   |    2 +-
 archetypes/camel-archetype-cdi/pom.xml             |    2 +-
 archetypes/camel-archetype-component/pom.xml       |    2 +-
 archetypes/camel-archetype-dataformat/pom.xml      |    2 +-
 archetypes/camel-archetype-java/pom.xml            |    2 +-
 archetypes/camel-archetype-main/pom.xml            |    2 +-
 archetypes/camel-archetype-spring/pom.xml          |    2 +-
 archetypes/pom.xml                                 |    2 +-
 bom/camel-bom/pom.xml                              |    2 +-
 bom/pom.xml                                        |    2 +-
 buildingtools/pom.xml                              |    2 +-
 camel-dependencies/pom.xml                         |   97 +-
 catalog/camel-allcomponents/pom.xml                |    2 +-
 catalog/camel-catalog-console/pom.xml              |   12 +-
 .../camel/catalog/console/CatalogConsole.java      |    2 +-
 catalog/camel-catalog-lucene/pom.xml               |    2 +-
 catalog/camel-catalog-maven/pom.xml                |    2 +-
 catalog/camel-catalog/pom.xml                      |    2 +-
 .../camel/catalog/archetypes/archetype-catalog.xml |   14 +-
 .../org/apache/camel/catalog/components.properties |    3 -
 .../apache/camel/catalog/components/activemq.json  |  249 -
 .../org/apache/camel/catalog/components/amqp.json  |    2 +-
 .../apache/camel/catalog/components/arangodb.json  |    2 +-
 .../org/apache/camel/catalog/components/as2.json   |    2 +-
 .../apache/camel/catalog/components/asterisk.json  |    2 +-
 .../apache/camel/catalog/components/atlasmap.json  |    2 +-
 .../org/apache/camel/catalog/components/atmos.json |    2 +-
 .../catalog/components/atmosphere-websocket.json   |    6 +-
 .../org/apache/camel/catalog/components/atom.json  |    2 +-
 .../org/apache/camel/catalog/components/avro.json  |    2 +-
 .../camel/catalog/components/aws-cloudtrail.json   |    4 +-
 .../catalog/components/aws-secrets-manager.json    |    2 +-
 .../camel/catalog/components/aws2-athena.json      |    2 +-
 .../apache/camel/catalog/components/aws2-cw.json   |    2 +-
 .../apache/camel/catalog/components/aws2-ddb.json  |    2 +-
 .../camel/catalog/components/aws2-ddbstream.json   |    2 +-
 .../apache/camel/catalog/components/aws2-ec2.json  |    2 +-
 .../apache/camel/catalog/components/aws2-ecs.json  |    2 +-
 .../apache/camel/catalog/components/aws2-eks.json  |    2 +-
 .../camel/catalog/components/aws2-eventbridge.json |    2 +-
 .../apache/camel/catalog/components/aws2-iam.json  |    2 +-
 .../catalog/components/aws2-kinesis-firehose.json  |    2 +-
 .../camel/catalog/components/aws2-kinesis.json     |    2 +-
 .../apache/camel/catalog/components/aws2-kms.json  |    2 +-
 .../camel/catalog/components/aws2-lambda.json      |    2 +-
 .../apache/camel/catalog/components/aws2-mq.json   |    2 +-
 .../apache/camel/catalog/components/aws2-msk.json  |    2 +-
 .../apache/camel/catalog/components/aws2-s3.json   |    2 +-
 .../apache/camel/catalog/components/aws2-ses.json  |    2 +-
 .../apache/camel/catalog/components/aws2-sns.json  |    2 +-
 .../apache/camel/catalog/components/aws2-sqs.json  |    2 +-
 .../apache/camel/catalog/components/aws2-sts.json  |    2 +-
 .../camel/catalog/components/aws2-translate.json   |    2 +-
 .../camel/catalog/components/azure-cosmosdb.json   |    2 +-
 .../camel/catalog/components/azure-eventhubs.json  |    2 +-
 .../camel/catalog/components/azure-key-vault.json  |    2 +-
 .../camel/catalog/components/azure-servicebus.json |    2 +-
 .../catalog/components/azure-storage-blob.json     |    2 +-
 .../catalog/components/azure-storage-datalake.json |    2 +-
 .../catalog/components/azure-storage-queue.json    |    2 +-
 .../camel/catalog/components/bean-validator.json   |    2 +-
 .../org/apache/camel/catalog/components/bean.json  |    2 +-
 .../apache/camel/catalog/components/bonita.json    |    2 +-
 .../org/apache/camel/catalog/components/box.json   |    2 +-
 .../apache/camel/catalog/components/braintree.json |    2 +-
 .../apache/camel/catalog/components/browse.json    |    2 +-
 .../camel/catalog/components/caffeine-cache.json   |    2 +-
 .../catalog/components/caffeine-loadcache.json     |    2 +-
 .../camel/catalog/components/chatscript.json       |    2 +-
 .../org/apache/camel/catalog/components/chunk.json |    2 +-
 .../org/apache/camel/catalog/components/class.json |    2 +-
 .../apache/camel/catalog/components/cm-sms.json    |    2 +-
 .../org/apache/camel/catalog/components/cmis.json  |    2 +-
 .../apache/camel/catalog/components/coap+tcp.json  |    2 +-
 .../org/apache/camel/catalog/components/coap.json  |    2 +-
 .../apache/camel/catalog/components/coaps+tcp.json |    2 +-
 .../org/apache/camel/catalog/components/coaps.json |    2 +-
 .../apache/camel/catalog/components/cometd.json    |    2 +-
 .../apache/camel/catalog/components/cometds.json   |    2 +-
 .../apache/camel/catalog/components/consul.json    |    2 +-
 .../camel/catalog/components/controlbus.json       |    2 +-
 .../org/apache/camel/catalog/components/corda.json |    2 +-
 .../apache/camel/catalog/components/couchbase.json |    2 +-
 .../apache/camel/catalog/components/couchdb.json   |    2 +-
 .../org/apache/camel/catalog/components/cql.json   |    2 +-
 .../org/apache/camel/catalog/components/cron.json  |    2 +-
 .../apache/camel/catalog/components/crypto.json    |    2 +-
 .../org/apache/camel/catalog/components/cxf.json   |    2 +-
 .../org/apache/camel/catalog/components/cxfrs.json |    2 +-
 .../camel/catalog/components/dataformat.json       |    2 +-
 .../camel/catalog/components/dataset-test.json     |    2 +-
 .../apache/camel/catalog/components/dataset.json   |    2 +-
 .../camel/catalog/components/debezium-db2.json     |    2 +-
 .../camel/catalog/components/debezium-mongodb.json |    2 +-
 .../camel/catalog/components/debezium-mysql.json   |    2 +-
 .../camel/catalog/components/debezium-oracle.json  |    2 +-
 .../catalog/components/debezium-postgres.json      |    2 +-
 .../catalog/components/debezium-sqlserver.json     |    2 +-
 .../camel/catalog/components/digitalocean.json     |    2 +-
 .../apache/camel/catalog/components/direct-vm.json |    2 +-
 .../apache/camel/catalog/components/direct.json    |    2 +-
 .../camel/catalog/components/disruptor-vm.json     |    2 +-
 .../apache/camel/catalog/components/disruptor.json |    2 +-
 .../org/apache/camel/catalog/components/djl.json   |    2 +-
 .../org/apache/camel/catalog/components/dns.json   |    2 +-
 .../apache/camel/catalog/components/docker.json    |    2 +-
 .../org/apache/camel/catalog/components/dozer.json |    2 +-
 .../org/apache/camel/catalog/components/drill.json |    2 +-
 .../apache/camel/catalog/components/dropbox.json   |    2 +-
 .../camel/catalog/components/dynamic-router.json   |    2 +-
 .../apache/camel/catalog/components/ehcache.json   |    2 +-
 .../catalog/components/elasticsearch-rest.json     |    2 +-
 .../camel/catalog/components/elasticsearch.json    |    4 +-
 .../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  |   24 +-
 .../org/apache/camel/catalog/components/https.json |   24 +-
 .../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      |    4 +-
 .../camel/catalog/components/iec60870-client.json  |    2 +-
 .../camel/catalog/components/iec60870-server.json  |    2 +-
 .../camel/catalog/components/ignite-cache.json     |    2 +-
 .../camel/catalog/components/ignite-compute.json   |    2 +-
 .../camel/catalog/components/ignite-events.json    |    2 +-
 .../camel/catalog/components/ignite-idgen.json     |    2 +-
 .../camel/catalog/components/ignite-messaging.json |    2 +-
 .../camel/catalog/components/ignite-queue.json     |    2 +-
 .../camel/catalog/components/ignite-set.json       |    2 +-
 .../org/apache/camel/catalog/components/imap.json  |    2 +-
 .../org/apache/camel/catalog/components/imaps.json |    2 +-
 .../catalog/components/infinispan-embedded.json    |    2 +-
 .../camel/catalog/components/infinispan.json       |    2 +-
 .../apache/camel/catalog/components/influxdb.json  |    2 +-
 .../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 |   10 +-
 .../camel/catalog/components/jgroups-raft.json     |    2 +-
 .../apache/camel/catalog/components/jgroups.json   |    2 +-
 .../org/apache/camel/catalog/components/jira.json  |    2 +-
 .../org/apache/camel/catalog/components/jms.json   |    2 +-
 .../org/apache/camel/catalog/components/jmx.json   |    2 +-
 .../org/apache/camel/catalog/components/jolt.json  |    2 +-
 .../org/apache/camel/catalog/components/jooq.json  |    2 +-
 .../org/apache/camel/catalog/components/jpa.json   |    2 +-
 .../org/apache/camel/catalog/components/jslt.json  |    2 +-
 .../camel/catalog/components/json-patch.json       |    2 +-
 .../camel/catalog/components/json-validator.json   |    2 +-
 .../apache/camel/catalog/components/jsonata.json   |    2 +-
 .../org/apache/camel/catalog/components/jt400.json |    2 +-
 .../org/apache/camel/catalog/components/kafka.json |   18 +-
 .../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  |    4 +-
 .../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 |    4 +-
 .../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 |    4 +-
 .../org/apache/camel/catalog/components/pop3.json  |    2 +-
 .../org/apache/camel/catalog/components/pop3s.json |    2 +-
 .../apache/camel/catalog/components/pubnub.json    |    2 +-
 .../apache/camel/catalog/components/pulsar.json    |    2 +-
 .../apache/camel/catalog/components/quartz.json    |    2 +-
 .../apache/camel/catalog/components/quickfix.json  |    2 +-
 .../apache/camel/catalog/components/rabbitmq.json  |    2 +-
 .../camel/catalog/components/reactive-streams.json |    2 +-
 .../org/apache/camel/catalog/components/ref.json   |    2 +-
 .../apache/camel/catalog/components/rest-api.json  |    2 +-
 .../camel/catalog/components/rest-openapi.json     |    2 +-
 .../camel/catalog/components/rest-swagger.json     |    2 +-
 .../org/apache/camel/catalog/components/rest.json  |    2 +-
 .../apache/camel/catalog/components/resteasy.json  |   20 +-
 .../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   |    8 +-
 .../org/apache/camel/catalog/components/sftp.json  |    2 +-
 .../org/apache/camel/catalog/components/sjms.json  |    2 +-
 .../org/apache/camel/catalog/components/sjms2.json |    2 +-
 .../org/apache/camel/catalog/components/slack.json |    2 +-
 .../org/apache/camel/catalog/components/smpp.json  |    2 +-
 .../org/apache/camel/catalog/components/smpps.json |    2 +-
 .../org/apache/camel/catalog/components/smtp.json  |    2 +-
 .../org/apache/camel/catalog/components/smtps.json |    2 +-
 .../org/apache/camel/catalog/components/snmp.json  |    2 +-
 .../org/apache/camel/catalog/components/solr.json  |    2 +-
 .../apache/camel/catalog/components/solrCloud.json |    2 +-
 .../org/apache/camel/catalog/components/solrs.json |    2 +-
 .../org/apache/camel/catalog/components/spark.json |    2 +-
 .../camel/catalog/components/splunk-hec.json       |    2 +-
 .../apache/camel/catalog/components/splunk.json    |    2 +-
 .../camel/catalog/components/spring-batch.json     |    2 +-
 .../camel/catalog/components/spring-event.json     |    2 +-
 .../catalog/components/spring-integration.json     |    2 +-
 .../camel/catalog/components/spring-jdbc.json      |    2 +-
 .../camel/catalog/components/spring-ldap.json      |    2 +-
 .../camel/catalog/components/spring-rabbitmq.json  |    2 +-
 .../camel/catalog/components/spring-redis.json     |    2 +-
 .../apache/camel/catalog/components/spring-ws.json |    2 +-
 .../camel/catalog/components/sql-stored.json       |    2 +-
 .../org/apache/camel/catalog/components/sql.json   |    2 +-
 .../org/apache/camel/catalog/components/ssh.json   |    2 +-
 .../org/apache/camel/catalog/components/stax.json  |    2 +-
 .../apache/camel/catalog/components/stitch.json    |    2 +-
 .../org/apache/camel/catalog/components/stomp.json |   54 -
 .../apache/camel/catalog/components/stream.json    |    2 +-
 .../camel/catalog/components/string-template.json  |    2 +-
 .../org/apache/camel/catalog/components/stub.json  |    2 +-
 .../apache/camel/catalog/components/telegram.json  |    2 +-
 .../apache/camel/catalog/components/thrift.json    |    2 +-
 .../org/apache/camel/catalog/components/tika.json  |    2 +-
 .../org/apache/camel/catalog/components/timer.json |    2 +-
 .../apache/camel/catalog/components/twilio.json    |    2 +-
 .../catalog/components/twitter-directmessage.json  |    2 +-
 .../camel/catalog/components/twitter-search.json   |    2 +-
 .../camel/catalog/components/twitter-timeline.json |    2 +-
 .../apache/camel/catalog/components/undertow.json  |    2 +-
 .../apache/camel/catalog/components/validator.json |    2 +-
 .../apache/camel/catalog/components/velocity.json  |    2 +-
 .../camel/catalog/components/vertx-http.json       |    2 +-
 .../camel/catalog/components/vertx-kafka.json      |    2 +-
 .../camel/catalog/components/vertx-websocket.json  |    2 +-
 .../org/apache/camel/catalog/components/vertx.json |    2 +-
 .../org/apache/camel/catalog/components/vm.json    |    2 +-
 .../apache/camel/catalog/components/weather.json   |    2 +-
 .../org/apache/camel/catalog/components/web3j.json |    2 +-
 .../apache/camel/catalog/components/webhook.json   |    2 +-
 .../camel/catalog/components/websocket-jsr356.json |    2 +-
 .../apache/camel/catalog/components/websocket.json |   73 -
 .../org/apache/camel/catalog/components/weka.json  |    2 +-
 .../apache/camel/catalog/components/whatsapp.json  |    4 +-
 .../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.properties    |    1 -
 .../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 |   13 +-
 .../apache/camel/catalog/dataformats/fhirXml.json  |   13 +-
 .../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 |    3 +-
 .../apache/camel/catalog/dataformats/johnzon.json  |   23 -
 .../apache/camel/catalog/dataformats/jsonApi.json  |    6 +-
 .../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  |    4 +-
 .../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 +-
 .../main/camel-main-configuration-metadata.json    |    2 +-
 .../apache/camel/catalog/main/sensitive-keys.json  |    2 -
 .../org/apache/camel/catalog/models.properties     |    3 +-
 .../org/apache/camel/catalog/models/fhirJson.json  |   11 +-
 .../org/apache/camel/catalog/models/fhirXml.json   |   11 +-
 .../org/apache/camel/catalog/models/jaxb.json      |    1 +
 .../org/apache/camel/catalog/models/jsonApi.json   |    4 +-
 .../org/apache/camel/catalog/models/param.json     |    3 +-
 .../{errorHandlerRef.json => refErrorHandler.json} |    8 +-
 .../camel/catalog/models/responseHeader.json       |    2 +-
 .../org/apache/camel/catalog/models/route.json     |    5 +-
 .../org/apache/camel/catalog/models/value.json     |   17 +
 .../org/apache/camel/catalog/models/xstream.json   |    2 +-
 .../org/apache/camel/catalog/others.properties     |   14 -
 .../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 |   15 -
 .../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  |   15 -
 .../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  |   15 -
 .../apache/camel/catalog/others/dsl-support.json   |    2 +-
 .../org/apache/camel/catalog/others/elytron.json   |    2 +-
 .../apache/camel/catalog/others/endpointdsl.json   |   15 -
 .../apache/camel/catalog/others/groovy-dsl.json    |   15 -
 .../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 |   15 -
 .../org/apache/camel/catalog/others/jfr.json       |    2 +-
 .../org/apache/camel/catalog/others/js-dsl.json    |   15 -
 .../org/apache/camel/catalog/others/jsh-dsl.json   |   15 -
 .../org/apache/camel/catalog/others/jta.json       |    2 +-
 .../apache/camel/catalog/others/kamelet-main.json  |   15 -
 .../apache/camel/catalog/others/kotlin-dsl.json    |   15 -
 .../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  |   15 -
 .../apache/camel/catalog/others/test-junit5.json   |    2 +-
 .../camel/catalog/others/test-spring-junit5.json   |    2 +-
 .../apache/camel/catalog/others/test-spring.json   |   15 -
 .../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       |    6 +-
 .../apache/camel/catalog/others/xml-io-dsl.json    |    2 +-
 .../apache/camel/catalog/others/xml-jaxb-dsl.json  |   15 -
 .../org/apache/camel/catalog/others/yaml-dsl.json  |   15 -
 .../org/apache/camel/catalog/others/zipkin.json    |    2 +-
 .../apache/camel/catalog/schemas/camel-spring.xsd  | 7705 +++++++-------------
 catalog/camel-csimple-maven-plugin/pom.xml         |    2 +-
 catalog/camel-report-maven-plugin/pom.xml          |    2 +-
 .../org/apache/camel/maven/RouteCoverageMojo.java  |   30 +-
 catalog/camel-route-parser/pom.xml                 |    2 +-
 .../apache/camel/parser/helper/CamelXmlHelper.java |    8 +-
 .../camel/parser/helper/XmlLineNumberParser.java   |    9 +-
 catalog/dummy-component/pom.xml                    |    2 +-
 catalog/pom.xml                                    |    2 +-
 components/camel-activemq/pom.xml                  |    2 +-
 .../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 -
 components/camel-amqp/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/amqp/amqp.json      |    2 +-
 components/camel-any23/pom.xml                     |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../org/apache/camel/dataformat/any23/any23.json   |    2 +-
 components/camel-arangodb/pom.xml                  |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/arangodb/arangodb.json  |    2 +-
 components/camel-as2/camel-as2-api/pom.xml         |    9 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/as2-api.json           |    2 +-
 .../component/as2/api/entity/EntityParser.java     |   87 +-
 .../as2/api/io/AS2SessionInputBuffer.java          |    9 +
 .../component/as2/api/util/HttpMessageUtils.java   |    8 +
 .../camel/component/as2/api/AS2MessageTest.java    |  119 +
 components/camel-as2/camel-as2-component/pom.xml   |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/as2/as2.json        |    2 +-
 components/camel-as2/pom.xml                       |    2 +-
 components/camel-asn1/pom.xml                      |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../org/apache/camel/dataformat/asn1/asn1.json     |    2 +-
 components/camel-asterisk/pom.xml                  |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/asterisk/asterisk.json  |    2 +-
 components/camel-atlasmap/pom.xml                  |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/atlasmap/atlasmap.json  |    2 +-
 components/camel-atmos/pom.xml                     |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/atmos/atmos.json    |    2 +-
 components/camel-atmosphere-websocket/pom.xml      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../atmosphere/websocket/atmosphere-websocket.json |    6 +-
 .../websocket/CamelWebSocketServlet.java           |   18 +-
 components/camel-atom/pom.xml                      |    2 +-
 .../services/org/apache/camel/atom-adapter-factory |    2 -
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/atom/atom.json      |    2 +-
 components/camel-attachments/pom.xml               |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/attachments.json       |    2 +-
 .../camel-avro-rpc-component/pom.xml               |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/avro/avro.json      |    2 +-
 .../camel-avro-rpc/camel-avro-rpc-jetty/pom.xml    |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/avro-rpc-jetty.json    |    2 +-
 .../camel-avro-rpc/camel-avro-rpc-spi/pom.xml      |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/avro-rpc-spi.json      |    2 +-
 components/camel-avro-rpc/pom.xml                  |    2 +-
 components/camel-avro/pom.xml                      |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../org/apache/camel/dataformat/avro/avro.json     |    2 +-
 components/camel-aws/camel-aws-cloudtrail/pom.xml  |    2 +-
 .../services/org/apache/camel/component.properties |    4 +-
 .../org/apache/camel/component/aws-kinesis         |    2 -
 .../component/aws/cloudtrail/aws-cloudtrail.json   |    4 +-
 .../src/main/docs/aws-cloudtrail-component.adoc    |    2 +-
 .../aws/cloudtrail/CloudtrailConsumer.java         |    6 +-
 .../camel-aws/camel-aws-secrets-manager/pom.xml    |    4 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../aws/secretsmanager/aws-secrets-manager.json    |    2 +-
 .../aws/secretsmanager/SecretsDevConsole.java      |    2 +-
 .../vault/CloudTrailReloadTriggerTask.java         |    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        |   11 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/aws2/ecs/aws2-ecs.json  |    2 +-
 .../component/aws2/ecs/ECS2ClientHealthCheck.java  |   80 +
 .../camel/component/aws2/ecs/ECS2Component.java    |    2 -
 .../aws2/ecs/ECS2ComponentVerifierExtension.java   |   95 -
 .../camel/component/aws2/ecs/ECS2Endpoint.java     |   17 +
 .../ecs/ECS2ClientHealthCheckProfileCredsTest.java |   97 +
 .../ecs/ECS2ClientHealthCheckStaticCredsTest.java  |   97 +
 .../ecs/ECS2ComponentVerifierExtensionTest.java    |   94 -
 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/component/aws2/eks/EKS2Endpoint.java     |    1 -
 .../camel-aws/camel-aws2-eventbridge/pom.xml       |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../aws2/eventbridge/aws2-eventbridge.json         |    2 +-
 components/camel-aws/camel-aws2-iam/pom.xml        |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/aws2/iam/aws2-iam.json  |    2 +-
 components/camel-aws/camel-aws2-kinesis/pom.xml    |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../aws2/firehose/aws2-kinesis-firehose.json       |    2 +-
 .../camel/component/aws2/kinesis/aws2-kinesis.json |    2 +-
 components/camel-aws/camel-aws2-kms/pom.xml        |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/aws2/kms/aws2-kms.json  |    2 +-
 components/camel-aws/camel-aws2-lambda/pom.xml     |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/aws2/lambda/aws2-lambda.json   |    2 +-
 components/camel-aws/camel-aws2-mq/pom.xml         |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/aws2/mq/aws2-mq.json    |    2 +-
 components/camel-aws/camel-aws2-msk/pom.xml        |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/aws2/msk/aws2-msk.json  |    2 +-
 components/camel-aws/camel-aws2-s3/pom.xml         |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/aws2/s3/aws2-s3.json    |    2 +-
 components/camel-aws/camel-aws2-ses/pom.xml        |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/aws2/ses/aws2-ses.json  |    2 +-
 components/camel-aws/camel-aws2-sns/pom.xml        |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/aws2/sns/aws2-sns.json  |    2 +-
 components/camel-aws/camel-aws2-sqs/pom.xml        |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/aws2/sqs/aws2-sqs.json  |    2 +-
 components/camel-aws/camel-aws2-sts/pom.xml        |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/aws2/sts/aws2-sts.json  |    2 +-
 components/camel-aws/camel-aws2-translate/pom.xml  |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../component/aws2/translate/aws2-translate.json   |    2 +-
 components/camel-aws/pom.xml                       |    2 +-
 .../camel-azure/camel-azure-cosmosdb/pom.xml       |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../component/azure/cosmosdb/azure-cosmosdb.json   |    2 +-
 .../camel-azure/camel-azure-eventhubs/pom.xml      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../component/azure/eventhubs/azure-eventhubs.json |    2 +-
 .../camel-azure/camel-azure-key-vault/pom.xml      |    4 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../component/azure/key/vault/azure-key-vault.json |    2 +-
 .../key/vault/AzureKeyVaultManagerDevConsole.java  |    2 +-
 .../camel-azure/camel-azure-servicebus/pom.xml     |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../azure/servicebus/azure-servicebus.json         |    2 +-
 .../camel-azure/camel-azure-storage-blob/pom.xml   |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../azure/storage/blob/azure-storage-blob.json     |    2 +-
 .../camel-azure-storage-datalake/pom.xml           |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../storage/datalake/azure-storage-datalake.json   |    2 +-
 .../camel-azure/camel-azure-storage-queue/pom.xml  |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../azure/storage/queue/azure-storage-queue.json   |    2 +-
 components/camel-azure/pom.xml                     |    2 +-
 components/camel-barcode/pom.xml                   |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../apache/camel/dataformat/barcode/barcode.json   |    2 +-
 components/camel-base64/pom.xml                    |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../org/apache/camel/dataformat/base64/base64.json |    2 +-
 components/camel-bean-validator/pom.xml            |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../component/bean/validator/bean-validator.json   |    2 +-
 components/camel-bean/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../services/org/apache/camel/language.properties  |    2 +-
 .../org/apache/camel/component/bean/bean.json      |    2 +-
 .../apache/camel/component/beanclass/class.json    |    2 +-
 .../org/apache/camel/language/bean/bean.json       |    2 +-
 components/camel-bindy/pom.xml                     |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../camel/dataformat/bindy/csv/bindyCsv.json       |    2 +-
 .../camel/dataformat/bindy/fixed/bindyFixed.json   |    2 +-
 .../camel/dataformat/bindy/kvp/bindyKvp.json       |    2 +-
 components/camel-bonita/pom.xml                    |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/bonita/bonita.json  |    2 +-
 components/camel-box/camel-box-api/pom.xml         |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/box-api.json           |    2 +-
 components/camel-box/camel-box-component/pom.xml   |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/box/box.json        |    2 +-
 components/camel-box/pom.xml                       |    2 +-
 components/camel-braintree/pom.xml                 |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/braintree/braintree.json       |    2 +-
 components/camel-browse/pom.xml                    |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/browse/browse.json  |    2 +-
 components/camel-caffeine-lrucache/pom.xml         |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/caffeine-lrucache.json |    2 +-
 components/camel-caffeine/pom.xml                  |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../component/caffeine/cache/caffeine-cache.json   |    2 +-
 .../caffeine/load/caffeine-loadcache.json          |    2 +-
 components/camel-cassandraql/pom.xml               |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/cassandra/cql.json  |    2 +-
 components/camel-cbor/pom.xml                      |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../org/apache/camel/component/cbor/cbor.json      |    2 +-
 components/camel-cdi-jta/pom.xml                   |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/cdi-jta.json           |    2 +-
 components/camel-cdi-main/pom.xml                  |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/cdi-main.json          |    2 +-
 components/camel-cdi/pom.xml                       |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../camel-cdi/src/generated/resources/cdi.json     |    2 +-
 .../resources/org/apache/camel/cdi/xml/jaxb.index  |   15 -
 .../camel/cdi/test/CamelEventNotifierTest.java     |   30 +-
 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 +-
 .../camel/component/cm/CMSenderOneMessageImpl.java |   13 +-
 components/camel-cmis/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/cmis/cmis.json      |    2 +-
 components/camel-coap/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../resources/org/apache/camel/coap/coap+tcp.json  |    2 +-
 .../resources/org/apache/camel/coap/coap.json      |    2 +-
 .../resources/org/apache/camel/coap/coaps+tcp.json |    2 +-
 .../resources/org/apache/camel/coap/coaps.json     |    2 +-
 components/camel-cometd/pom.xml                    |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/cometd/cometd.json  |    2 +-
 .../org/apache/camel/component/cometd/cometds.json |    2 +-
 components/camel-consul/pom.xml                    |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/consul/consul.json  |    2 +-
 components/camel-controlbus/pom.xml                |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/controlbus/controlbus.json     |    2 +-
 components/camel-corda/pom.xml                     |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/corda/corda.json    |    2 +-
 components/camel-couchbase/pom.xml                 |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/couchbase/couchbase.json       |    2 +-
 components/camel-couchdb/pom.xml                   |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/couchdb/couchdb.json    |    2 +-
 components/camel-cron/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/cron/cron.json      |    2 +-
 components/camel-crypto/pom.xml                    |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../org/apache/camel/component/crypto/crypto.json  |    2 +-
 .../org/apache/camel/converter/crypto/crypto.json  |    2 +-
 .../org/apache/camel/converter/crypto/pgp.json     |    2 +-
 components/camel-csimple-joor/pom.xml              |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/csimple-joor.json      |    2 +-
 components/camel-csv/pom.xml                       |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../org/apache/camel/dataformat/csv/csv.json       |    2 +-
 components/camel-cxf/camel-cxf-common/pom.xml      |    2 +-
 components/camel-cxf/camel-cxf-rest/pom.xml        |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/cxf/jaxrs/cxfrs.json    |    2 +-
 components/camel-cxf/camel-cxf-soap/pom.xml        |    2 +-
 .../camel/component/cxf/CxfEndpointUriFactory.java |  110 -
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/cxf/jaxws/cxf.json  |    2 +-
 .../camel-cxf/camel-cxf-spring-common/pom.xml      |    2 +-
 components/camel-cxf/camel-cxf-spring-rest/pom.xml |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/cxf-spring-rest.json   |    2 +-
 components/camel-cxf/camel-cxf-spring-soap/pom.xml |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/cxf-spring-soap.json   |    2 +-
 .../camel-cxf/camel-cxf-spring-transport/pom.xml   |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../generated/resources/cxf-spring-transport.json  |    2 +-
 components/camel-cxf/camel-cxf-transport/pom.xml   |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/cxf-transport.json     |    2 +-
 components/camel-cxf/pom.xml                       |    2 +-
 .../services/org/apache/camel/component.properties |    7 -
 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        |    4 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/debezium-common.json   |    2 +-
 .../camel-debezium-maven-plugin/pom.xml            |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../generated/resources/debezium-maven-plugin.json |    2 +-
 .../camel-debezium/camel-debezium-common/pom.xml   |    2 +-
 .../camel-debezium/camel-debezium-db2/pom.xml      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/debezium/debezium-db2.json     |    2 +-
 .../camel-debezium/camel-debezium-mongodb/pom.xml  |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/debezium/debezium-mongodb.json |    2 +-
 .../camel-debezium/camel-debezium-mysql/pom.xml    |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/debezium/debezium-mysql.json   |    2 +-
 .../camel-debezium/camel-debezium-oracle/pom.xml   |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/debezium/debezium-oracle.json  |    2 +-
 .../camel-debezium/camel-debezium-postgres/pom.xml |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../component/debezium/debezium-postgres.json      |    2 +-
 .../camel-debezium-sqlserver/pom.xml               |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../component/debezium/debezium-sqlserver.json     |    2 +-
 components/camel-debezium/pom.xml                  |    2 +-
 components/camel-debug/pom.xml                     |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../camel-debug/src/generated/resources/debug.json |    2 +-
 components/camel-digitalocean/pom.xml              |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/digitalocean/digitalocean.json |    2 +-
 components/camel-direct/pom.xml                    |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/direct/direct.json  |    2 +-
 components/camel-directvm/pom.xml                  |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/directvm/direct-vm.json |    2 +-
 components/camel-disruptor/pom.xml                 |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/disruptor/disruptor-vm.json    |    2 +-
 .../camel/component/disruptor/disruptor.json       |    2 +-
 components/camel-djl/pom.xml                       |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/djl/djl.json        |    2 +-
 components/camel-dns/pom.xml                       |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/dns/dns.json        |    2 +-
 components/camel-docker/pom.xml                    |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/docker/docker.json  |    2 +-
 .../camel/component/docker/DockerOperation.java    |    4 +-
 components/camel-dozer/pom.xml                     |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/dozer/dozer.json    |    2 +-
 components/camel-drill/pom.xml                     |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/drill/drill.json    |    2 +-
 components/camel-dropbox/pom.xml                   |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/dropbox/dropbox.json    |    2 +-
 components/camel-dynamic-router/pom.xml            |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../component/dynamicrouter/dynamic-router.json    |    2 +-
 components/camel-ehcache/pom.xml                   |   16 +-
 .../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   |    4 +-
 .../src/main/docs/elasticsearch-component.adoc     |    2 +-
 components/camel-elytron/pom.xml                   |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/elytron.json           |    2 +-
 components/camel-etcd3/pom.xml                     |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/etcd3/etcd3.json    |    2 +-
 components/camel-exec/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/exec/exec.json      |    2 +-
 .../exec/impl/DefaultExecCommandExecutor.java      |    2 +-
 components/camel-facebook/pom.xml                  |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/facebook/facebook.json  |    2 +-
 components/camel-fastjson/pom.xml                  |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../apache/camel/component/fastjson/fastjson.json  |    2 +-
 components/camel-fhir/camel-fhir-api/pom.xml       |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/fhir-api.json          |    2 +-
 components/camel-fhir/camel-fhir-component/pom.xml |    2 +-
 .../fhir/FhirJsonDataFormatConfigurer.java         |   10 +
 .../fhir/FhirXmlDataFormatConfigurer.java          |   10 +
 .../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  |   13 +-
 .../org/apache/camel/component/fhir/fhirXml.json   |   13 +-
 .../camel/component/fhir/FhirDataFormat.java       |   38 +-
 .../spring/FhirDataformatConfigSpringTest.java     |    2 +-
 .../fhir/FhirDataFormatConfigSpringTest.xml        |   67 +-
 .../FhirJsonDataFormatErrorHandlerSpringTest.xml   |   14 +-
 .../FhirXmlDataFormatErrorHandlerSpringTest.xml    |   14 +-
 components/camel-fhir/pom.xml                      |    2 +-
 components/camel-file-watch/pom.xml                |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/file/watch/file-watch.json     |    2 +-
 components/camel-file/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/file/file.json      |    2 +-
 components/camel-flatpack/pom.xml                  |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../apache/camel/component/flatpack/flatpack.json  |    2 +-
 .../apache/camel/dataformat/flatpack/flatpack.json |    2 +-
 components/camel-flink/pom.xml                     |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/flink/flink.json    |    2 +-
 components/camel-fop/pom.xml                       |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/fop/fop.json        |    2 +-
 components/camel-freemarker/pom.xml                |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/freemarker/freemarker.json     |    2 +-
 components/camel-ftp/pom.xml                       |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/file/remote/ftp.json    |    2 +-
 .../apache/camel/component/file/remote/ftps.json   |    2 +-
 .../apache/camel/component/file/remote/sftp.json   |    2 +-
 .../component/file/remote/SftpOperations.java      |    2 +-
 components/camel-geocoder/pom.xml                  |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/geocoder/geocoder.json  |    2 +-
 components/camel-git/pom.xml                       |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/git/git.json        |    2 +-
 components/camel-github/pom.xml                    |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/github/github.json  |    2 +-
 .../camel-google/camel-google-bigquery/pom.xml     |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../component/google/bigquery/google-bigquery.json |    2 +-
 .../google/bigquery/sql/google-bigquery-sql.json   |    2 +-
 .../camel-google/camel-google-calendar/pom.xml     |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../component/google/calendar/google-calendar.json |    2 +-
 .../calendar/stream/google-calendar-stream.json    |    2 +-
 .../calendar/BatchGoogleCalendarClientFactory.java |    2 +-
 components/camel-google/camel-google-drive/pom.xml |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/google/drive/google-drive.json |    2 +-
 .../drive/BatchGoogleDriveClientFactory.java       |    2 +-
 .../camel-google/camel-google-functions/pom.xml    |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../google/functions/google-functions.json         |    2 +-
 components/camel-google/camel-google-mail/pom.xml  |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/google/mail/google-mail.json   |    2 +-
 .../google/mail/stream/google-mail-stream.json     |    2 +-
 .../google/mail/BatchGoogleMailClientFactory.java  |    2 +-
 .../camel-google/camel-google-pubsub/pom.xml       |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../component/google/pubsub/google-pubsub.json     |    2 +-
 .../camel-google-secret-manager/pom.xml            |    4 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../secret/manager/google-secret-manager.json      |    2 +-
 .../manager/GoogleSecretManagerDevConsole.java     |    2 +-
 .../camel-google/camel-google-sheets/pom.xml       |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../component/google/sheets/google-sheets.json     |    2 +-
 .../google/sheets/stream/google-sheets-stream.json |    2 +-
 .../sheets/BatchGoogleSheetsClientFactory.java     |    2 +-
 .../camel-google/camel-google-storage/pom.xml      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../component/google/storage/google-storage.json   |    2 +-
 components/camel-google/pom.xml                    |    2 +-
 components/camel-gora/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/gora/gora.json      |    2 +-
 components/camel-grape/pom.xml                     |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/grape/grape.json    |    2 +-
 components/camel-graphql/pom.xml                   |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/graphql/graphql.json    |    2 +-
 components/camel-grok/pom.xml                      |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../org/apache/camel/component/grok/grok.json      |    2 +-
 components/camel-groovy/pom.xml                    |    2 +-
 .../services/org/apache/camel/language.properties  |    2 +-
 .../org/apache/camel/language/groovy/groovy.json   |    2 +-
 components/camel-grpc/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/grpc/grpc.json      |    2 +-
 components/camel-gson/pom.xml                      |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../org/apache/camel/component/gson/gson.json      |    2 +-
 components/camel-guava-eventbus/pom.xml            |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../component/guava/eventbus/guava-eventbus.json   |    2 +-
 components/camel-hashicorp-vault/pom.xml           |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../component/hashicorp/vault/hashicorp-vault.json |    2 +-
 components/camel-hazelcast/pom.xml                 |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../atomicnumber/hazelcast-atomicvalue.json        |    2 +-
 .../hazelcast/instance/hazelcast-instance.json     |    2 +-
 .../component/hazelcast/list/hazelcast-list.json   |    2 +-
 .../component/hazelcast/map/hazelcast-map.json     |    2 +-
 .../hazelcast/multimap/hazelcast-multimap.json     |    2 +-
 .../component/hazelcast/queue/hazelcast-queue.json |    2 +-
 .../replicatedmap/hazelcast-replicatedmap.json     |    2 +-
 .../hazelcast/ringbuffer/hazelcast-ringbuffer.json |    2 +-
 .../component/hazelcast/seda/hazelcast-seda.json   |    2 +-
 .../component/hazelcast/set/hazelcast-set.json     |    2 +-
 .../component/hazelcast/topic/hazelcast-topic.json |    2 +-
 components/camel-hbase/pom.xml                     |   15 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/hbase/hbase.json    |    2 +-
 .../camel-hbase/src/main/docs/hbase-component.adoc |    2 +
 .../camel/component/hbase/HBaseConstants.java      |    2 +
 .../camel/component/hbase/HBaseProducer.java       |   67 +
 .../camel/component/hbase/HBaseProducerIT.java     |   54 +
 components/camel-hdfs/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/hdfs/hdfs.json      |    2 +-
 components/camel-headersmap/pom.xml                |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/headersmap.json        |    2 +-
 components/camel-hl7/pom.xml                       |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../services/org/apache/camel/language.properties  |    2 +-
 .../org/apache/camel/component/hl7/hl7.json        |    2 +-
 .../org/apache/camel/component/hl7/hl7terser.json  |    2 +-
 components/camel-http-base/pom.xml                 |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/http-base.json         |    2 +-
 components/camel-http-common/pom.xml               |    2 +-
 .../camel/http/common/HttpConverterLoader.java     |   12 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/http-common.json       |    2 +-
 .../org/apache/camel/http/common/CamelServlet.java |   28 +-
 .../camel/http/common/HttpCommonEndpoint.java      |   11 +-
 components/camel-http/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/http/http.json      |   24 +-
 .../org/apache/camel/component/http/https.json     |   24 +-
 .../apache/camel/component/http/HttpComponent.java |   23 +-
 .../apache/camel/component/http/HttpEndpoint.java  |    8 +-
 .../camel/component/http/FollowRedirectTest.java   |   86 +
 .../camel/component/http/HttpRedirectTest.java     |    4 +-
 .../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   |    4 +-
 .../src/main/docs/hyperledger-aries-component.adoc |    2 +-
 .../aries/handler/PresentProofServiceHandler.java  |   17 +-
 components/camel-ical/pom.xml                      |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../org/apache/camel/component/ical/ical.json      |    2 +-
 components/camel-iec60870/pom.xml                  |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../component/iec60870/client/iec60870-client.json |    2 +-
 .../component/iec60870/server/iec60870-server.json |    2 +-
 components/camel-ignite/pom.xml                    |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/ignite/cache/ignite-cache.json |    2 +-
 .../component/ignite/compute/ignite-compute.json   |    2 +-
 .../component/ignite/events/ignite-events.json     |    2 +-
 .../camel/component/ignite/idgen/ignite-idgen.json |    2 +-
 .../ignite/messaging/ignite-messaging.json         |    2 +-
 .../camel/component/ignite/queue/ignite-queue.json |    2 +-
 .../camel/component/ignite/set/ignite-set.json     |    2 +-
 .../camel-infinispan-common/pom.xml                |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/infinispan-common.json |    2 +-
 .../camel-infinispan-embedded/pom.xml              |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../infinispan/embedded/infinispan-embedded.json   |    2 +-
 .../camel-infinispan/camel-infinispan/pom.xml      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../component/infinispan/remote/infinispan.json    |    2 +-
 components/camel-infinispan/pom.xml                |    2 +-
 components/camel-influxdb/pom.xml                  |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/influxdb/influxdb.json  |    2 +-
 components/camel-influxdb2/pom.xml                 |    2 +-
 .../influxdb2/InfluxDbComponentConfigurer.java     |   61 -
 .../influxdb2/InfluxDbEndpointConfigurer.java      |   77 -
 .../influxdb2/InfluxDbEndpointUriFactory.java      |   76 -
 .../converters/CamelInfluxDbConvertersLoader.java  |   48 -
 .../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              |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../camel/component/jackson/avro/avroJackson.json  |    2 +-
 components/camel-jackson-protobuf/pom.xml          |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../jackson/protobuf/protobufJackson.json          |    2 +-
 components/camel-jackson/pom.xml                   |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../apache/camel/component/jackson/jackson.json    |    2 +-
 components/camel-jacksonxml/pom.xml                |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../camel/component/jacksonxml/jacksonXml.json     |    2 +-
 components/camel-jasypt/pom.xml                    |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/jasypt.json            |    2 +-
 components/camel-javascript/pom.xml                |    2 +-
 .../services/org/apache/camel/language.properties  |    2 +-
 .../resources/org/apache/camel/language/js/js.json |    2 +-
 components/camel-jaxb/pom.xml                      |    2 +-
 .../converter/jaxb/JaxbDataFormatConfigurer.java   |    2 +
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../org/apache/camel/converter/jaxb/jaxb.json      |    3 +-
 .../camel-jaxb/src/main/docs/jaxb-dataformat.adoc  |   37 +-
 .../camel/converter/jaxb/JaxbDataFormat.java       |   56 +-
 ...ncurrentJaxbDataFormatSchemaValidationTest.java |    1 +
 .../jaxb/JaxbDataFormatSchemaValidationTest.java   |    1 +
 .../java/org/apache/camel/jaxb/CamelJaxbTest.java  |    1 +
 .../org/apache/camel/converter/jaxb/context.xml    |    6 +-
 components/camel-jbpm/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/jbpm/jbpm.json      |    2 +-
 components/camel-jcache/pom.xml                    |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/jcache/jcache.json  |    2 +-
 components/camel-jclouds/pom.xml                   |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/jclouds/jclouds.json    |    2 +-
 components/camel-jcr/pom.xml                       |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/jcr/jcr.json        |    2 +-
 components/camel-jdbc/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/jdbc/jdbc.json      |    2 +-
 components/camel-jetty-common/pom.xml              |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/jetty-common.json      |    2 +-
 .../component/jetty/CamelContinuationServlet.java  |   20 +-
 components/camel-jetty/pom.xml                     |    2 +-
 .../jetty11/JettyHttpComponent11Configurer.java    |    5 +
 .../jetty11/JettyHttpEndpoint11Configurer.java     |    5 +
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/jetty11/jetty.json  |    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                       |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/jms/jms.json        |    2 +-
 .../component/jms/JmsDeadLetterQueueTest.java      |   10 +-
 ...msDeadLetterQueueUsingTransferExchangeTest.java |   10 +-
 ...OnCompletionAndInterceptAndOnExceptionTest.java |    6 +-
 .../camel/component/jms/JmsOnCompletionTest.java   |    6 +-
 .../component/jms/JmsTransferExceptionTest.java    |    4 +-
 .../component/jms/tx/RouteIdTransactedTest.java    |    4 +-
 components/camel-jmx/pom.xml                       |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/jmx/jmx.json        |    2 +-
 components/camel-johnzon/pom.xml                   |    2 +-
 .../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 -
 components/camel-jolt/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/jolt/jolt.json      |    2 +-
 components/camel-jooq/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/jooq/jooq.json      |    2 +-
 components/camel-joor/pom.xml                      |    2 +-
 .../services/org/apache/camel/language.properties  |    2 +-
 .../org/apache/camel/language/joor/joor.json       |    2 +-
 components/camel-jpa/pom.xml                       |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/jpa/jpa.json        |    2 +-
 components/camel-jq/pom.xml                        |    2 +-
 .../services/org/apache/camel/language.properties  |    2 +-
 .../resources/org/apache/camel/language/jq/jq.json |    2 +-
 components/camel-jsch/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/scp/scp.json        |    2 +-
 components/camel-jslt/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/jslt/jslt.json      |    2 +-
 components/camel-json-patch/pom.xml                |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/jsonpatch/json-patch.json      |    2 +-
 components/camel-json-validator/pom.xml            |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../component/jsonvalidator/json-validator.json    |    2 +-
 components/camel-jsonapi/pom.xml                   |    2 +-
 .../jsonapi/JsonApiDataFormatConfigurer.java       |    4 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../apache/camel/component/jsonapi/jsonApi.json    |    6 +-
 .../camel/component/jsonapi/JsonApiDataFormat.java |  108 +-
 .../component/jsonapi/JsonApiDataFormatTest.java   |    4 +-
 components/camel-jsonata/pom.xml                   |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/jsonata/jsonata.json    |    2 +-
 components/camel-jsonb/pom.xml                     |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../org/apache/camel/component/jsonb/jsonb.json    |    2 +-
 components/camel-jsonpath/pom.xml                  |    2 +-
 .../services/org/apache/camel/language.properties  |    2 +-
 .../org/apache/camel/jsonpath/jsonpath.json        |    2 +-
 components/camel-jt400/pom.xml                     |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/jt400/jt400.json    |    2 +-
 components/camel-jta/pom.xml                       |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../camel-jta/src/generated/resources/jta.json     |    2 +-
 .../org/apache/camel/jta/JtaTransactionPolicy.java |    6 +-
 components/camel-kafka/pom.xml                     |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/kafka/kafka.json    |   18 +-
 .../camel/component/kafka/KafkaConfiguration.java  |   59 +-
 .../camel/component/kafka/KafkaComponentTest.java  |    1 -
 components/camel-kamelet/pom.xml                   |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/kamelet/kamelet.json    |    2 +-
 components/camel-knative/camel-knative-api/pom.xml |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/knative-api.json       |    2 +-
 .../camel-knative/camel-knative-component/pom.xml  |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/knative/knative.json    |    2 +-
 .../camel-knative/camel-knative-http/pom.xml       |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/knative-http.json      |    2 +-
 components/camel-knative/pom.xml                   |    2 +-
 components/camel-kubernetes/pom.xml                |    2 +-
 .../client/ConfigFluentImplConfigurer.java         |   12 +
 .../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                      |   18 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/kudu/kudu.json      |    4 +-
 .../camel-kudu/src/main/docs/kudu-component.adoc   |    2 +-
 .../camel/component/kudu/KuduOperations.java       |    3 +
 .../apache/camel/component/kudu/KuduProducer.java  |   75 +-
 .../camel/component/kudu/KuduProducerTest.java     |  153 +
 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 +-
 .../camel-ldap/src/main/docs/ldap-component.adoc   |   45 +-
 .../apache/camel/component/ldap/LdapHelper.java    |   68 +
 .../apache/camel/component/ldap/LdapProducer.java  |   44 -
 components/camel-ldif/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/ldif/ldif.json      |    2 +-
 components/camel-leveldb/pom.xml                   |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/leveldb.json           |    2 +-
 components/camel-log/pom.xml                       |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/log/log.json        |    2 +-
 components/camel-lra/pom.xml                       |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../camel-lra/src/generated/resources/lra.json     |    2 +-
 components/camel-lucene/pom.xml                    |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/lucene/lucene.json  |    2 +-
 components/camel-lumberjack/pom.xml                |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/lumberjack/lumberjack.json     |    2 +-
 components/camel-lzf/pom.xml                       |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../org/apache/camel/dataformat/lzf/lzf.json       |    2 +-
 components/camel-mail-microsoft-oauth/pom.xml      |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../generated/resources/mail-microsoft-oauth.json  |    2 +-
 components/camel-mail/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../org/apache/camel/component/mail/imap.json      |    2 +-
 .../org/apache/camel/component/mail/imaps.json     |    2 +-
 .../org/apache/camel/component/mail/pop3.json      |    2 +-
 .../org/apache/camel/component/mail/pop3s.json     |    2 +-
 .../org/apache/camel/component/mail/smtp.json      |    2 +-
 .../org/apache/camel/component/mail/smtps.json     |    2 +-
 .../dataformat/mime/multipart/mimeMultipart.json   |    2 +-
 components/camel-mapstruct/pom.xml                 |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/mapstruct/mapstruct.json       |    4 +-
 .../src/main/docs/mapstruct-component.adoc         |    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                |    4 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/micrometer/micrometer.json     |    2 +-
 .../component/micrometer/MicrometerConsole.java    |    2 +-
 .../MicrometerExchangeEventNotifier.java           |   10 +-
 .../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     |    8 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../resources/microprofile-fault-tolerance.json    |    2 +-
 .../faulttolerance/FaultToleranceConsole.java      |    2 +-
 .../camel-microprofile-health/pom.xml              |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../generated/resources/microprofile-health.json   |    2 +-
 .../camel-microprofile-metrics/pom.xml             |    4 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../microprofile/metrics/microprofile-metrics.json |    2 +-
 .../microprofile/metrics/MicroProfileConsole.java  |    2 +-
 components/camel-microprofile/pom.xml              |    2 +-
 components/camel-milo/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/milo/browse/milo-browse.json   |    2 +-
 .../camel/component/milo/client/milo-client.json   |    2 +-
 .../camel/component/milo/server/milo-server.json   |    2 +-
 components/camel-mina/pom.xml                      |    4 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/mina/mina.json      |    2 +-
 .../apache/camel/component/mina/MinaConsole.java   |    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                      |    4 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/mllp/mllp.json      |    2 +-
 .../apache/camel/component/mllp/MllpConsole.java   |    2 +-
 components/camel-mock/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/mock/mock.json      |    2 +-
 components/camel-mongodb-gridfs/pom.xml            |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../component/mongodb/gridfs/mongodb-gridfs.json   |    2 +-
 components/camel-mongodb/pom.xml                   |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/mongodb/mongodb.json    |    2 +-
 components/camel-mustache/pom.xml                  |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/mustache/mustache.json  |    2 +-
 components/camel-mvel/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../services/org/apache/camel/language.properties  |    2 +-
 .../org/apache/camel/component/mvel/mvel.json      |    2 +-
 .../org/apache/camel/language/mvel/mvel.json       |    2 +-
 components/camel-mybatis/pom.xml                   |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/mybatis/mybatis-bean.json      |    2 +-
 .../apache/camel/component/mybatis/mybatis.json    |    2 +-
 components/camel-nats/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/nats/nats.json      |    2 +-
 components/camel-netty-http/pom.xml                |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/netty/http/netty-http.json     |    2 +-
 components/camel-netty/pom.xml                     |    4 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/netty/netty.json    |    2 +-
 .../apache/camel/component/netty/NettyConsole.java |    2 +-
 components/camel-nitrite/pom.xml                   |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/nitrite/nitrite.json    |    2 +-
 components/camel-oaipmh/pom.xml                    |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/oaipmh/component/oaipmh.json  |    2 +-
 components/camel-ognl/pom.xml                      |    2 +-
 .../services/org/apache/camel/language.properties  |    2 +-
 .../org/apache/camel/language/ognl/ognl.json       |    2 +-
 components/camel-olingo2/camel-olingo2-api/pom.xml |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/olingo2-api.json       |    2 +-
 .../camel-olingo2/camel-olingo2-component/pom.xml  |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/olingo2/olingo2.json    |    2 +-
 components/camel-olingo2/pom.xml                   |    2 +-
 components/camel-olingo4/camel-olingo4-api/pom.xml |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/olingo4-api.json       |    2 +-
 .../component/olingo4/api/impl/Olingo4AppImpl.java |    2 +-
 .../camel-olingo4/camel-olingo4-component/pom.xml  |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/olingo4/olingo4.json    |    2 +-
 components/camel-olingo4/pom.xml                   |    2 +-
 components/camel-openapi-java/pom.xml              |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/openapi-java.json      |    2 +-
 .../apache/camel/openapi/RestModelConverters.java  |    9 +-
 .../apache/camel/openapi/RestOpenApiReader.java    |   12 +-
 .../camel/openapi/RestOpenApiReaderModelTest.java  |    2 +
 .../test/java/org/apache/camel/openapi/User.java   |   12 +
 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 +-
 .../opentelemetry/OpenTelemetrySpanAdapter.java    |    5 +
 .../CamelOpenTelemetryTestSupport.java             |   56 +-
 .../camel/opentelemetry/CurrentSpanTest.java       |  354 +
 components/camel-opentracing/pom.xml               |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/opentracing.json       |    2 +-
 components/camel-optaplanner/pom.xml               |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/optaplanner/optaplanner.json   |    2 +-
 components/camel-paho-mqtt5/pom.xml                |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/paho/mqtt5/paho-mqtt5.json     |    2 +-
 components/camel-paho/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/paho/paho.json      |    2 +-
 components/camel-pdf/pom.xml                       |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/pdf/pdf.json        |    2 +-
 components/camel-pg-replication-slot/pom.xml       |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../pg/replication/slot/pg-replication-slot.json   |    2 +-
 components/camel-pgevent/pom.xml                   |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/pgevent/pgevent.json    |    2 +-
 components/camel-platform-http-vertx/pom.xml       |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../generated/resources/platform-http-vertx.json   |    2 +-
 components/camel-platform-http/pom.xml             |    4 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../component/platform/http/platform-http.json     |    2 +-
 .../platform/http/PlatformHttpConsole.java         |    2 +-
 components/camel-plc4x/pom.xml                     |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/plc4x/plc4x.json    |    4 +-
 .../camel-plc4x/src/main/docs/plc4x-component.adoc |    2 +-
 .../camel/component/plc4x/Plc4XEndpoint.java       |    3 +
 components/camel-printer/pom.xml                   |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/printer/lpr.json    |    2 +-
 components/camel-protobuf/pom.xml                  |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../apache/camel/dataformat/protobuf/protobuf.json |    2 +-
 components/camel-pubnub/pom.xml                    |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/pubnub/pubnub.json  |    2 +-
 components/camel-pulsar/pom.xml                    |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/pulsar/pulsar.json  |    2 +-
 components/camel-python/pom.xml                    |    2 +-
 .../services/org/apache/camel/language.properties  |    2 +-
 .../org/apache/camel/language/python/python.json   |    2 +-
 components/camel-quartz/pom.xml                    |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/quartz/quartz.json  |    2 +-
 components/camel-quickfix/pom.xml                  |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/quickfixj/quickfix.json |    2 +-
 components/camel-rabbitmq/pom.xml                  |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/rabbitmq/rabbitmq.json  |    2 +-
 components/camel-reactive-executor-tomcat/pom.xml  |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../resources/reactive-executor-tomcat.json        |    2 +-
 components/camel-reactive-executor-vertx/pom.xml   |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../resources/reactive-executor-vertx.json         |    2 +-
 components/camel-reactive-streams/pom.xml          |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../reactive/streams/reactive-streams.json         |    2 +-
 .../src/main/docs/reactive-streams-component.adoc  |    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              |    8 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/resilience4j.json      |    2 +-
 .../component/resilience4j/ResilienceConsole.java  |    2 +-
 components/camel-resourceresolver-github/pom.xml   |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../resources/resourceresolver-github.json         |    2 +-
 components/camel-rest-openapi/pom.xml              |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/rest/openapi/rest-openapi.json |    2 +-
 components/camel-rest-swagger/pom.xml              |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/rest/swagger/rest-swagger.json |    2 +-
 components/camel-rest/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/rest/rest-api.json  |    2 +-
 .../org/apache/camel/component/rest/rest.json      |    2 +-
 components/camel-resteasy/pom.xml                  |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/resteasy/resteasy.json  |   20 +-
 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 +-
 components/camel-rxjava/pom.xml                    |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/rxjava.json            |    2 +-
 components/camel-saga/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/saga/saga.json      |    2 +-
 .../camel-salesforce-codegen/pom.xml               |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../generated/resources/salesforce-codegen.json    |    2 +-
 .../camel-salesforce-component/pom.xml             |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/salesforce/salesforce.json     |    2 +-
 .../src/main/docs/salesforce-component.adoc        |    5 +-
 .../camel-salesforce-maven-plugin/pom.xml          |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../resources/salesforce-maven-plugin.json         |    2 +-
 components/camel-salesforce/pom.xml                |    2 +-
 components/camel-sap-netweaver/pom.xml             |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../component/sap/netweaver/sap-netweaver.json     |    2 +-
 components/camel-saxon/pom.xml                     |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../services/org/apache/camel/language.properties  |    2 +-
 .../org/apache/camel/component/xquery/xquery.json  |    2 +-
 .../org/apache/camel/language/xquery/xquery.json   |    2 +-
 components/camel-scheduler/pom.xml                 |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/scheduler/scheduler.json       |    2 +-
 components/camel-schematron/pom.xml                |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/schematron/schematron.json     |    2 +-
 .../processor/SchematronProcessorFactory.java      |   20 +-
 components/camel-seda/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/seda/seda.json      |    2 +-
 components/camel-service/pom.xml                   |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/service/service.json    |    2 +-
 .../camel-servicenow-component/pom.xml             |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/servicenow/servicenow.json     |    2 +-
 .../camel-servicenow-maven-plugin/pom.xml          |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../resources/servicenow-maven-plugin.json         |    2 +-
 components/camel-servicenow/pom.xml                |    2 +-
 components/camel-servlet/pom.xml                   |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/servlet/servlet.json    |    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                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/sjms/sjms.json      |    2 +-
 components/camel-sjms2/pom.xml                     |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/sjms2/sjms2.json    |    2 +-
 components/camel-slack/pom.xml                     |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/slack/slack.json    |    2 +-
 components/camel-smpp/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/smpp/smpp.json      |    2 +-
 .../org/apache/camel/component/smpp/smpps.json     |    2 +-
 components/camel-snakeyaml/pom.xml                 |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../camel/component/snakeyaml/snakeYaml.json       |    2 +-
 components/camel-snmp/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/snmp/snmp.json      |    2 +-
 components/camel-soap/pom.xml                      |    2 +-
 .../soap/SoapJaxbDataFormatConfigurer.java         |   24 -
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../org/apache/camel/dataformat/soap/soap.json     |    2 +-
 components/camel-solr/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/solr/solr.json      |    2 +-
 .../org/apache/camel/component/solr/solrCloud.json |    2 +-
 .../org/apache/camel/component/solr/solrs.json     |    2 +-
 components/camel-spark/pom.xml                     |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/spark/spark.json    |    2 +-
 components/camel-splunk-hec/pom.xml                |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/splunkhec/splunk-hec.json      |    2 +-
 components/camel-splunk/pom.xml                    |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/splunk/splunk.json  |    2 +-
 components/camel-spring-batch/pom.xml              |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/spring/batch/spring-batch.json |    2 +-
 components/camel-spring-integration/pom.xml        |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../spring/integration/spring-integration.json     |    2 +-
 components/camel-spring-jdbc/pom.xml               |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/spring/jdbc/spring-jdbc.json   |    2 +-
 components/camel-spring-ldap/pom.xml               |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/springldap/spring-ldap.json    |    2 +-
 components/camel-spring-main/pom.xml               |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/spring-main.json       |    2 +-
 components/camel-spring-rabbitmq/pom.xml           |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../component/springrabbit/spring-rabbitmq.json    |    2 +-
 components/camel-spring-redis/pom.xml              |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/redis/spring-redis.json |    2 +-
 components/camel-spring-security/pom.xml           |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/spring-security.json   |    2 +-
 components/camel-spring-ws/pom.xml                 |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/spring/ws/spring-ws.json       |    2 +-
 .../spring/ws/bean/CamelEndpointMapping.java       |   10 +
 .../spring/ws/filter/impl/BasicMessageFilter.java  |   11 +-
 .../impl/HeaderTransformationMessageFilter.java    |   17 +-
 components/camel-spring-xml/pom.xml                |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/spring-xml.json        |    2 +-
 .../org/apache/camel/spring/RoutePropertyTest.java |   28 +-
 .../src/test/resources/custom.properties           |    1 +
 .../camel/component/rest/SpringFromRestGetTest.xml |    5 +-
 .../rest/SpringFromRestIdAndDescriptionTest.xml    |    5 +-
 .../org/apache/camel/spring/RoutePropertyTest.xml  |   31 +-
 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 +-
 .../camel/spring/spi/SpringTransactionPolicy.java  |    6 +-
 components/camel-sql/pom.xml                       |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/sql/sql.json        |    2 +-
 .../camel/component/sql/stored/sql-stored.json     |    2 +-
 components/camel-ssh/pom.xml                       |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/ssh/ssh.json        |    2 +-
 components/camel-stax/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../services/org/apache/camel/language.properties  |    2 +-
 .../org/apache/camel/component/stax/stax.json      |    2 +-
 .../camel/language/xtokenizer/xtokenize.json       |    2 +-
 .../component/stax/StAXJAXBIteratorExpression.java |    3 +
 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 +-
 .../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 -
 components/camel-stream/pom.xml                    |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/stream/stream.json  |    2 +-
 components/camel-stringtemplate/pom.xml            |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../component/stringtemplate/string-template.json  |    2 +-
 components/camel-stub/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/stub/stub.json      |    2 +-
 components/camel-swagger-java/pom.xml              |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/swagger-java.json      |    2 +-
 .../apache/camel/swagger/RestSwaggerReader.java    |   22 +-
 components/camel-swift/pom.xml                     |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../apache/camel/dataformat/swift/mt/swiftMt.json  |    2 +-
 .../apache/camel/dataformat/swift/mx/swiftMx.json  |    2 +-
 components/camel-syslog/pom.xml                    |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../org/apache/camel/component/syslog/syslog.json  |    2 +-
 components/camel-tarfile/pom.xml                   |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../apache/camel/dataformat/tarfile/tarFile.json   |    2 +-
 .../aggregate/tarfile/TarAggregationStrategy.java  |    8 +
 components/camel-telegram/pom.xml                  |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/telegram/telegram.json  |    2 +-
 .../camel-test/camel-test-cdi-junit5/pom.xml       |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/test-cdi-junit5.json   |    2 +-
 components/camel-test/camel-test-cdi/pom.xml       |    2 +-
 .../services/org/apache/camel/other.properties     |    7 -
 .../src/generated/resources/test-cdi.json          |   15 -
 components/camel-test/camel-test-junit5/pom.xml    |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/test-junit5.json       |    2 +-
 .../camel-test/camel-test-main-junit5/pom.xml      |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/test-main-junit5.json  |    2 +-
 .../camel-test/camel-test-spring-junit5/pom.xml    |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../generated/resources/test-spring-junit5.json    |    2 +-
 components/camel-test/camel-test-spring/pom.xml    |    2 +-
 .../services/org/apache/camel/other.properties     |    7 -
 .../src/generated/resources/test-spring.json       |   15 -
 .../camel/test/spring/CamelAnnotationsHandler.java |    2 +-
 components/camel-test/camel-test/pom.xml           |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../camel-test/src/generated/resources/test.json   |    2 +-
 .../apache/camel/test/junit4/CamelTestSupport.java |    2 +-
 components/camel-test/pom.xml                      |    2 +-
 components/camel-threadpoolfactory-vertx/pom.xml   |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../resources/threadpoolfactory-vertx.json         |    2 +-
 components/camel-thrift/pom.xml                    |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../org/apache/camel/component/thrift/thrift.json  |    2 +-
 .../org/apache/camel/dataformat/thrift/thrift.json |    2 +-
 components/camel-tika/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/tika/tika.json      |    2 +-
 components/camel-timer/pom.xml                     |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/timer/timer.json    |    2 +-
 components/camel-tracing/pom.xml                   |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/tracing.json           |    2 +-
 .../apache/camel/tracing/ActiveSpanManager.java    |   58 +-
 .../java/org/apache/camel/tracing/SpanAdapter.java |    4 +
 .../main/java/org/apache/camel/tracing/Tracer.java |   33 +-
 .../camel/tracing/ActiveSpanManagerTest.java       |   24 +-
 .../org/apache/camel/tracing/MockSpanAdapter.java  |   21 +
 components/camel-twilio/pom.xml                    |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/twilio/twilio.json  |    2 +-
 components/camel-twitter/pom.xml                   |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../directmessage/twitter-directmessage.json       |    2 +-
 .../component/twitter/search/twitter-search.json   |    2 +-
 .../twitter/timeline/twitter-timeline.json         |    2 +-
 components/camel-undertow-spring-security/pom.xml  |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../resources/undertow-spring-security.json        |    2 +-
 components/camel-undertow/pom.xml                  |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/undertow/undertow.json  |    2 +-
 components/camel-univocity-parsers/pom.xml         |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../camel/dataformat/univocity/univocityCsv.json   |    2 +-
 .../camel/dataformat/univocity/univocityFixed.json |    2 +-
 .../camel/dataformat/univocity/univocityTsv.json   |    2 +-
 components/camel-validator/pom.xml                 |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/validator/validator.json       |    2 +-
 components/camel-velocity/pom.xml                  |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/velocity/velocity.json  |    2 +-
 components/camel-vertx/camel-vertx-common/pom.xml  |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/vertx-common.json      |    2 +-
 components/camel-vertx/camel-vertx-http/pom.xml    |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/vertx/http/vertx-http.json     |    2 +-
 .../camel-vertx-kafka-component/pom.xml            |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/vertx/kafka/vertx-kafka.json   |    2 +-
 .../camel-vertx-kafka-maven-plugin/pom.xml         |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../resources/vertx-kafka-maven-plugin.json        |    2 +-
 components/camel-vertx/camel-vertx-kafka/pom.xml   |    2 +-
 .../camel-vertx/camel-vertx-websocket/pom.xml      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../component/vertx/websocket/vertx-websocket.json |    2 +-
 components/camel-vertx/camel-vertx/pom.xml         |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/vertx/vertx.json    |    2 +-
 components/camel-vertx/pom.xml                     |    2 +-
 components/camel-vm/pom.xml                        |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/vm/vm.json          |    2 +-
 components/camel-wal/pom.xml                       |    6 +-
 .../services/org/apache/camel/other.properties     |    4 +-
 .../camel-wal/src/generated/resources/wal.json     |    6 +-
 .../src/main/docs/{wal-docs.adoc => wal.adoc}      |    9 +-
 .../org/apache/camel/component/wal/LogWriter.java  |    2 +-
 components/camel-weather/pom.xml                   |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/weather/weather.json    |    2 +-
 components/camel-web3j/pom.xml                     |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/web3j/web3j.json    |    2 +-
 components/camel-webhook/pom.xml                   |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/webhook/webhook.json    |    2 +-
 components/camel-websocket-jsr356/pom.xml          |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/websocket/jsr356/websocket-jsr356.json   |    2 +-
 components/camel-websocket/pom.xml                 |    2 +-
 .../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 -
 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  |    4 +-
 .../src/main/docs/whatsapp-component.adoc          |    2 +-
 components/camel-wordpress/pom.xml                 |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/wordpress/wordpress.json       |    2 +-
 components/camel-workday/pom.xml                   |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/workday/workday.json    |    2 +-
 components/camel-xchange/pom.xml                   |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../apache/camel/component/xchange/xchange.json    |    2 +-
 components/camel-xj/pom.xml                        |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/xj/xj.json          |    2 +-
 components/camel-xmlsecurity/pom.xml               |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../component/xmlsecurity/xmlsecurity-sign.json    |    2 +-
 .../component/xmlsecurity/xmlsecurity-verify.json  |    2 +-
 .../camel/dataformat/xmlsecurity/xmlSecurity.json  |    2 +-
 .../processor/XmlSignatureProcessor.java           |    1 +
 components/camel-xmpp/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/xmpp/xmpp.json      |    2 +-
 components/camel-xpath/pom.xml                     |    2 +-
 .../services/org/apache/camel/language.properties  |    2 +-
 .../org/apache/camel/language/xpath/xpath.json     |    2 +-
 components/camel-xslt-saxon/pom.xml                |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/xslt/saxon/xslt-saxon.json     |    2 +-
 components/camel-xslt/pom.xml                      |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/xslt/xslt.json      |    2 +-
 components/camel-xstream/pom.xml                   |    4 +-
 .../org/apache/camel/dataformat.properties         |    4 +-
 .../apache/camel/dataformat/xstream/xstream.json   |    4 +-
 .../camel/dataformat/xstream/xstreamJson.json      |    2 +-
 .../src/main/docs/xstream-dataformat.adoc          |    5 +-
 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                   |    7 +-
 .../org/apache/camel/dataformat.properties         |    2 +-
 .../apache/camel/dataformat/zipfile/zipFile.json   |    2 +-
 .../aggregate/zipfile/ZipAggregationStrategy.java  |    8 +
 .../zipfile/ZipAggregationStrategySplitTest.java   |  104 +
 components/camel-zipkin/pom.xml                    |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/zipkin.json            |    2 +-
 components/camel-zookeeper-master/pom.xml          |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../zookeepermaster/zookeeper-master.json          |    2 +-
 components/camel-zookeeper/pom.xml                 |    2 +-
 .../services/org/apache/camel/component.properties |    2 +-
 .../camel/component/zookeeper/zookeeper.json       |    2 +-
 components/pom.xml                                 |    2 +-
 core/camel-api/pom.xml                             |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 core/camel-api/src/generated/resources/api.json    |    2 +-
 .../java/org/apache/camel/AggregationStrategy.java |   13 +
 .../org/apache/camel/ExtendedCamelContext.java     |    6 +-
 .../main/java/org/apache/camel/StreamCache.java    |    2 +-
 .../java/org/apache/camel/console/DevConsole.java  |    2 +-
 .../main/java/org/apache/camel/spi/CamelEvent.java |   10 +
 .../java/org/apache/camel/spi/EventFactory.java    |   13 +-
 .../java/org/apache/camel/spi/EventNotifier.java   |    3 +
 .../camel/support/jsse/KeyStoreParameters.java     |    8 +-
 core/camel-base-engine/pom.xml                     |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/base-engine.json       |    2 +-
 .../camel/impl/engine/CamelInternalProcessor.java  |    5 +
 .../apache/camel/impl/engine/DefaultTracer.java    |    7 -
 core/camel-base/pom.xml                            |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 core/camel-base/src/generated/resources/base.json  |    2 +-
 .../impl/converter/CoreTypeConverterRegistry.java  |    5 +-
 .../camel/impl/event/DefaultEventFactory.java      |    9 +
 .../event/ExchangeAsyncProcessingStartedEvent.java |   44 +
 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  |  146 -
 core/camel-console/pom.xml                         |    4 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/console.json           |    2 +-
 .../apache/camel/impl/console/BlockedConsole.java  |    1 +
 .../camel/impl/console/ContextDevConsole.java      |    1 +
 .../impl/console/DefaultDevConsoleRegistry.java    |    2 +-
 .../camel/impl/console/EndpointDevConsole.java     |    1 +
 .../apache/camel/impl/console/EventConsole.java    |  173 +-
 .../impl/console/GarbageCollectorDevConsole.java   |    1 +
 .../camel/impl/console/HealthDevConsole.java       |    1 +
 .../apache/camel/impl/console/InflightConsole.java |    1 +
 .../camel/impl/console/JavaSecurityDevConsole.java |    1 +
 .../apache/camel/impl/console/JvmDevConsole.java   |    1 +
 .../apache/camel/impl/console/LogDevConsole.java   |    1 +
 .../camel/impl/console/MemoryDevConsole.java       |    1 +
 .../camel/impl/console/PropertiesDevConsole.java   |    1 +
 .../camel/impl/console/RouteControllerConsole.java |    1 +
 .../apache/camel/impl/console/RouteDevConsole.java |    1 +
 .../camel/impl/console/SourceDevConsole.java       |    1 +
 .../camel/impl/console/ThreadDevConsole.java       |    1 +
 .../apache/camel/impl/console/TopDevConsole.java   |    1 +
 .../camel/impl/console/TypeConverterConsole.java   |    1 +
 core/camel-core-all/pom.xml                        |    2 +-
 core/camel-core-catalog/pom.xml                    |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/core-catalog.json      |    2 +-
 core/camel-core-engine/pom.xml                     |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/core-engine.json       |    2 +-
 .../docs/modules/eips/pages/event-message.adoc     |    4 +
 .../src/main/docs/modules/eips/pages/log-eip.adoc  |    2 +-
 .../docs/modules/eips/pages/message-history.adoc   |   12 +-
 core/camel-core-languages/pom.xml                  |    2 +-
 .../services/org/apache/camel/language.properties  |    2 +-
 .../apache/camel/language/constant/constant.json   |    2 +-
 .../org/apache/camel/language/csimple/csimple.json |    2 +-
 .../org/apache/camel/language/header/header.json   |    2 +-
 .../camel/language/property/exchangeProperty.json  |    2 +-
 .../org/apache/camel/language/ref/ref.json         |    2 +-
 .../org/apache/camel/language/simple/file.json     |    2 +-
 .../org/apache/camel/language/simple/simple.json   |    2 +-
 .../apache/camel/language/tokenizer/tokenize.json  |    2 +-
 core/camel-core-model/pom.xml                      |    2 +-
 .../services/org/apache/camel/model.properties     |    3 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/core-model.json        |    2 +-
 .../apache/camel/model/dataformat/fhirJson.json    |   11 +-
 .../org/apache/camel/model/dataformat/fhirXml.json |   11 +-
 .../org/apache/camel/model/dataformat/jaxb.json    |    1 +
 .../org/apache/camel/model/dataformat/jsonApi.json |    4 +-
 .../org/apache/camel/model/dataformat/xstream.json |    2 +-
 .../org/apache/camel/model/errorhandler/jaxb.index |    2 +-
 .../{errorHandlerRef.json => refErrorHandler.json} |    8 +-
 .../resources/org/apache/camel/model/jaxb.index    |    1 +
 .../org/apache/camel/model/rest/param.json         |    3 +-
 .../apache/camel/model/rest/responseHeader.json    |    2 +-
 .../resources/org/apache/camel/model/route.json    |    5 +-
 .../resources/org/apache/camel/model/value.json    |   17 +
 .../org/apache/camel/builder/AdviceWithTasks.java  |    2 +-
 .../org/apache/camel/builder/DataFormatClause.java |    2 +
 .../camel/builder/RefErrorHandlerBuilder.java      |    4 +-
 .../org/apache/camel/builder/RouteBuilder.java     |    4 +-
 .../apache/camel/model/ProcessorDefinition.java    |    3 +-
 .../camel/model/RouteConfigurationDefinition.java  |    4 +-
 .../org/apache/camel/model/RouteDefinition.java    |   12 +-
 .../apache/camel/model/RouteDefinitionHelper.java  |   23 +-
 .../org/apache/camel/model/ValueDefinition.java    |   56 +-
 .../camel/model/dataformat/FhirDataformat.java     |  311 +-
 .../camel/model/dataformat/JaxbDataFormat.java     |   36 +
 .../camel/model/dataformat/JsonApiDataFormat.java  |   71 +-
 .../camel/model/dataformat/XStreamDataFormat.java  |    2 +
 .../model/errorhandler/ErrorHandlerHelper.java     |   10 +-
 ...inition.java => RefErrorHandlerDefinition.java} |   12 +-
 .../apache/camel/model/rest/ParamDefinition.java   |   50 +-
 .../camel/model/rest/ResponseHeaderDefinition.java |   55 +-
 .../model/rest/RestConfigurationDefinition.java    |  114 +-
 core/camel-core-processor/pom.xml                  |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/core-processor.json    |    2 +-
 .../apache/camel/processor/MulticastProcessor.java |    6 +-
 .../camel/processor/OnCompletionProcessor.java     |   63 +-
 .../org/apache/camel/processor/SendProcessor.java  |    6 +-
 .../aggregate/AbstractListAggregationStrategy.java |    2 +-
 .../GroupedMessageAggregationStrategy.java         |    3 +-
 .../ShareUnitOfWorkAggregationStrategy.java        |    5 +
 core/camel-core-reifier/pom.xml                    |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/core-reifier.json      |    2 +-
 .../org/apache/camel/reifier/AbstractReifier.java  |    4 +
 .../reifier/dataformat/FhirDataFormatReifier.java  |   31 +-
 .../reifier/dataformat/JaxbDataFormatReifier.java  |    1 +
 .../dataformat/JsonApiDataFormatReifier.java       |    2 +
 .../errorhandler/ErrorHandlerRefReifier.java       |    6 +-
 .../reifier/errorhandler/ErrorHandlerReifier.java  |    4 +-
 core/camel-core-xml/pom.xml                        |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/core-xml.json          |    2 +-
 .../org/apache/camel/core/xml/export.json          |   22 -
 .../core/xml/AbstractCamelContextFactoryBean.java  |    4 +-
 core/camel-core/pom.xml                            |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 core/camel-core/src/generated/resources/core.json  |    2 +-
 .../builder/RouteTemplateErrorHandlerTest.java     |    6 +-
 ...InterceptSendToEndpointWithPlaceholderTest.java |   86 +
 .../apache/camel/builder/xml/XPathFeatureTest.java |   14 +-
 .../file/FileConsumerDeleteAndFailureTest.java     |    4 +-
 .../file/FileConsumerDeleteAndMoveFailedTest.java  |    2 +-
 .../file/FileConsumerMoveAndMoveFailureTest.java   |    6 +-
 .../FileConsumerMoveFailureOnCompletionTest.java   |   10 +-
 .../file/FileConsumerMoveFailureTest.java          |    6 +-
 .../rest/FromRestExplicitComponentTest.java        |    6 +-
 .../camel/component/rest/FromRestGetTest.java      |   27 +-
 .../rest/FromRestIdAndDescriptionTest.java         |    5 +-
 .../camel/component/rest/FromRestRouteIdTest.java  |    3 +-
 .../apache/camel/impl/ExpressionAdapterTest.java   |    4 +-
 .../apache/camel/impl/ExpressionSupportTest.java   |    4 +-
 .../camel/impl/event/EventNotifierEventsTest.java  |    3 +-
 .../impl/event/EventNotifierExchangeSentTest.java  |    2 +
 .../EventNotifierFailureHandledEventsTest.java     |    5 +
 .../event/EventNotifierRedeliveryEventsTest.java   |    1 +
 ...ExceptionErrorHandlerRefIssueTwoRoutesTest.java |    6 +-
 ...HandledRouteScopedErrorHandlerRefIssueTest.java |    4 +-
 ...ceptionRouteScopedErrorHandlerRefIssueTest.java |    4 +-
 .../OnExceptionBeforeErrorHandlerIssueTest.java    |    8 +-
 .../RecipientListErrorHandlingIssueTest.java       |   12 +-
 .../RouteConfigurationOnCompletionTest.java}       |   42 +-
 .../java/org/apache/camel/model/XmlParseTest.java  |    3 +-
 .../DefaultErrorHandlerExplicitConfiguredTest.java |    2 +-
 .../DefaultErrorHandlerOnExceptionTest.java        |    4 +-
 .../camel/processor/DefaultErrorHandlerTest.java   |    4 +-
 .../processor/ErrorHandlerWrappedEachNodeTest.java |   22 +-
 ...letionAndInterceptAndOnExceptionGlobalTest.java |    8 +-
 .../OnCompletionAndInterceptGlobalTest.java        |    8 +-
 .../processor/OnCompletionAndInterceptTest.java    |    8 +-
 .../camel/processor/OnCompletionAsyncTest.java     |   20 +-
 .../camel/processor/OnCompletionFailAndOkTest.java |    6 +-
 .../camel/processor/OnCompletionGlobalTest.java    |    8 +-
 .../OnCompletionMoreGlobalRouteCompletionTest.java |   12 +-
 .../processor/OnCompletionMoreGlobalTest.java      |    8 +-
 .../processor/OnCompletionOnCompleteOnlyTest.java  |    4 +-
 ...ompletionRouteScopeOverrideGlobalScopeTest.java |    8 +-
 .../apache/camel/processor/OnCompletionTest.java   |    8 +-
 .../processor/OnCompletionUseOriginalBodyTest.java |    4 +-
 .../org/apache/camel/processor/RouteIdTest.java    |    4 +-
 .../apache/camel/util/StingQuoteHelperTest.java    |   34 +
 .../dsl/DynamicRouterEndpointBuilderFactory.java   |  554 --
 core/camel-health/pom.xml                          |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/health.json            |    2 +-
 .../impl/health/DefaultHealthCheckRegistry.java    |    2 +-
 core/camel-main/pom.xml                            |    2 +-
 .../camel-main-configuration-metadata.json         |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 core/camel-main/src/generated/resources/main.json  |    2 +-
 .../org/apache/camel/main/components.properties    |    3 -
 .../org/apache/camel/main/dataformats.properties   |    1 -
 core/camel-main/src/main/docs/main.adoc            |    2 +-
 .../org/apache/camel/main/BaseMainSupport.java     |   14 +-
 .../camel/main/DefaultConfigurationProperties.java |    3 +-
 .../camel/main/MainDurationEventNotifier.java      |    7 +-
 .../java/org/apache/camel/main/MainSupport.java    |    1 +
 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 +-
 .../management/mbean/RouteCoverageXmlParser.java   |   24 +-
 .../ManagedRouteWithOnExceptionTest.java           |   10 +-
 core/camel-support/pom.xml                         |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/support.json           |    2 +-
 .../java/org/apache/camel/support/EventHelper.java |   47 +-
 .../camel/support/PropertyBindingSupport.java      |    4 +-
 .../camel/support/RouteWatcherReloadStrategy.java  |    2 +-
 .../camel/support/SimpleEventNotifierSupport.java  |   11 +
 .../camel/support}/console/AbstractDevConsole.java |    8 +-
 core/camel-util/pom.xml                            |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 core/camel-util/src/generated/resources/util.json  |    2 +-
 .../java/org/apache/camel/util/SensitiveUtils.java |    6 +-
 .../org/apache/camel/util/StringQuoteHelper.java   |    9 +
 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 +-
 .../java/org/apache/camel/xml/in/ModelParser.java  |   55 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/xml-io.json            |    2 +-
 .../java/org/apache/camel/xml/in/BaseParser.java   |   65 +-
 .../org/apache/camel/xml/in/ModelParserTest.java   |   39 +-
 .../src/test/resources/restAllowedValues.xml       |   42 +
 .../src/test/resources/routeProperty.xml}          |   28 +-
 core/camel-xml-jaxb/pom.xml                        |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/xml-jaxb.json          |    2 +-
 core/camel-xml-jaxp/pom.xml                        |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/xml-jaxp.json          |    2 +-
 .../apache/camel/converter/jaxp/XmlConverter.java  |   18 +
 .../support/builder/xml/XMLConverterHelper.java    |   19 +-
 .../support/processor/validation/SchemaReader.java |    1 +
 .../processor/validation/ValidatingProcessor.java  |   13 +-
 .../apache/camel/util/xml/XmlLineNumberParser.java |    8 +
 core/pom.xml                                       |    2 +-
 .../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/components/modules/others/nav.adoc            |    2 +-
 docs/components/modules/others/pages/wal-docs.adoc |    1 -
 docs/components/modules/others/pages/wal.adoc      |    1 +
 docs/main/modules/getting-started/pages/index.adoc |  336 +-
 docs/pom.xml                                       |    2 +-
 .../ROOT/pages/camel-3x-upgrade-guide-3_11.adoc    |    2 +-
 .../ROOT/pages/camel-3x-upgrade-guide-3_20.adoc    |   80 +-
 .../ROOT/pages/camel-3x-upgrade-guide-3_21.adoc    |   88 +
 .../modules/ROOT/pages/camel-3x-upgrade-guide.adoc |    1 +
 .../modules/ROOT/pages/camel-console.adoc          |    5 +-
 .../modules/ROOT/pages/camel-jbang.adoc            |   52 +-
 .../modules/ROOT/pages/camel-maven-archetypes.adoc |    4 +-
 docs/user-manual/modules/ROOT/pages/component.adoc |   67 +-
 docs/user-manual/modules/ROOT/pages/exchange.adoc  |    6 +
 docs/user-manual/modules/ROOT/pages/java-dsl.adoc  |   31 +-
 dsl/camel-cli-connector/pom.xml                    |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/cli-connector.json     |    4 +-
 .../src/main/docs/cli-connector.adoc               |    2 +-
 dsl/camel-componentdsl/pom.xml                     |    2 +-
 .../component/ComponentsBuilderFactory.java        |   43 +-
 .../dsl/ActivemqComponentBuilderFactory.java       | 2172 ------
 .../component/dsl/AmqpComponentBuilderFactory.java |   36 +-
 .../dsl/BeanValidatorComponentBuilderFactory.java  |    6 +-
 .../component/dsl/HttpComponentBuilderFactory.java |   88 +-
 .../dsl/HttpsComponentBuilderFactory.java          |   90 +-
 .../component/dsl/ImapComponentBuilderFactory.java |   14 +-
 .../dsl/ImapsComponentBuilderFactory.java          |   14 +-
 .../dsl/JettyComponentBuilderFactory.java          |   74 +-
 .../component/dsl/JmsComponentBuilderFactory.java  |   36 +-
 .../component/dsl/JpaComponentBuilderFactory.java  |    3 +-
 .../dsl/KafkaComponentBuilderFactory.java          |   75 +-
 .../dsl/Plc4xComponentBuilderFactory.java          |    4 +-
 .../component/dsl/Pop3ComponentBuilderFactory.java |   14 +-
 .../dsl/Pop3sComponentBuilderFactory.java          |   14 +-
 .../dsl/ResteasyComponentBuilderFactory.java       |   54 +-
 .../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 -
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/componentdsl.json      |    2 +-
 .../src/generated/resources/metadata.json          |  778 +-
 dsl/camel-dsl-modeline/pom.xml                     |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/dsl-modeline.json      |    2 +-
 dsl/camel-dsl-support/pom.xml                      |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/dsl-support.json       |    2 +-
 dsl/camel-endpointdsl-support/pom.xml              |    2 +-
 dsl/camel-endpointdsl/pom.xml                      |    2 +-
 .../builder/endpoint/EndpointBuilderFactory.java   |    5 +-
 .../camel/builder/endpoint/EndpointBuilders.java   |    5 +-
 .../builder/endpoint/StaticEndpointBuilders.java   |  177 +-
 .../endpoint/dsl/AMQPEndpointBuilderFactory.java   |  176 +-
 .../dsl/ActiveMQEndpointBuilderFactory.java        | 7132 ------------------
 .../AtmosphereWebsocketEndpointBuilderFactory.java |  216 +-
 .../dsl/BeanValidatorEndpointBuilderFactory.java   |   12 +-
 .../endpoint/dsl/HttpEndpointBuilderFactory.java   |  417 +-
 ...java => JettyHttp11EndpointBuilderFactory.java} |  301 +-
 .../endpoint/dsl/JmsEndpointBuilderFactory.java    |  176 +-
 .../endpoint/dsl/KafkaEndpointBuilderFactory.java  |  110 +-
 .../endpoint/dsl/MailEndpointBuilderFactory.java   |   40 +-
 .../endpoint/dsl/Plc4XEndpointBuilderFactory.java  |    6 +-
 .../dsl/ResteasyEndpointBuilderFactory.java        |  356 +-
 .../dsl/ServletEndpointBuilderFactory.java         |  208 +-
 .../endpoint/dsl/Sjms2EndpointBuilderFactory.java  |  176 +-
 .../endpoint/dsl/SjmsEndpointBuilderFactory.java   |  176 +-
 .../endpoint/dsl/StompEndpointBuilderFactory.java  |  833 ---
 .../dsl/WebsocketEndpointBuilderFactory.java       | 1496 ----
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/endpointdsl.json       |    2 +-
 .../camel-groovy-dsl-common/pom.xml                |    2 +-
 dsl/camel-groovy-dsl/camel-groovy-dsl-test/pom.xml |    2 +-
 dsl/camel-groovy-dsl/camel-groovy-dsl/pom.xml      |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/groovy-dsl.json        |    2 +-
 dsl/camel-groovy-dsl/pom.xml                       |    2 +-
 dsl/camel-java-joor-dsl/pom.xml                    |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/java-joor-dsl.json     |    2 +-
 dsl/camel-jbang/camel-jbang-core/pom.xml           |    2 +-
 .../dsl/jbang/core/commands/CamelJBangMain.java    |    5 +-
 .../dsl/jbang/core/commands/DependencyCommand.java |   22 +-
 .../dsl/jbang/core/commands/DependencyCopy.java    |  107 +
 .../{DependencyTree.java => DependencyList.java}   |    6 +-
 .../dsl/jbang/core/commands/ExportBaseCommand.java |    6 +-
 .../apache/camel/dsl/jbang/core/commands/Init.java |    2 +-
 .../jbang/core/commands/catalog/CatalogDoc.java    |    2 +-
 .../core/commands/catalog/CatalogKamelet.java      |    2 +-
 .../jbang/core/commands/catalog/CatalogOther.java  |    1 +
 .../jbang/core/commands/catalog/VersionHelper.java |    3 +
 .../camel/dsl/jbang/core/common/XmlHelper.java     |    5 +
 .../camel-jbang-main/dist/CamelJBang.java          |    6 +-
 dsl/camel-jbang/camel-jbang-main/pom.xml           |    2 +-
 .../src/main/jbang/main/CamelJBang.java            |    6 +-
 dsl/camel-jbang/pom.xml                            |    2 +-
 dsl/camel-js-dsl/pom.xml                           |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/js-dsl.json            |    2 +-
 dsl/camel-jsh-dsl/pom.xml                          |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/jsh-dsl.json           |    2 +-
 dsl/camel-kamelet-main/pom.xml                     |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../camel-component-known-dependencies.properties  |    5 +-
 .../src/generated/resources/kamelet-main.json      |    2 +-
 .../java/org/apache/camel/main/KameletMain.java    |    2 +
 .../main/console/DependencyDownloaderConsole.java  |    2 +-
 .../download/BasePackageScanDownloadListener.java  |  105 +
 .../main/download/DependencyDownloaderKamelet.java |   10 +-
 .../camel-main-known-dependencies.properties       |    2 +-
 dsl/camel-kotlin-dsl/pom.xml                       |    2 +-
 .../services/org/apache/camel/other.properties     |    7 -
 .../src/generated/resources/kotlin-dsl.json        |   15 -
 dsl/camel-xml-io-dsl/pom.xml                       |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../src/generated/resources/xml-io-dsl.json        |    2 +-
 dsl/camel-xml-jaxb-dsl-test/cdi/pom.xml            |    2 +-
 dsl/camel-xml-jaxb-dsl-test/definition/pom.xml     |    2 +-
 .../LoadRouteFromXmlWithOnExceptionTest.java       |    6 +-
 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 +-
 .../deserializers/ExpressionDeserializers.java     |    2 +
 .../dsl/yaml/deserializers/ModelDeserializers.java |  267 +-
 .../deserializers/ModelDeserializersResolver.java  |    8 +-
 .../ErrorHandlerBuilderDeserializer.java           |   39 +-
 .../camel-yaml-dsl-maven-plugin/pom.xml            |    2 +-
 .../dsl/yaml/GenerateYamlDeserializersMojo.java    |   14 +-
 .../maven/dsl/yaml/GenerateYamlSchemaMojo.java     |    8 +
 .../maven/dsl/yaml/GenerateYamlSupportMojo.java    |    2 +
 dsl/camel-yaml-dsl/camel-yaml-dsl/pom.xml          |    2 +-
 .../services/org/apache/camel/other.properties     |    2 +-
 .../generated/resources/schema/camel-yaml-dsl.json |  150 +-
 .../generated/resources/schema/camelYamlDsl.json   |  150 +-
 .../src/generated/resources/yaml-dsl.json          |    2 +-
 .../camel-yaml-dsl/src/main/docs/yaml-dsl.adoc     |   26 +-
 .../apache/camel/dsl/yaml/ErrorHandlerTest.groovy  |   56 +-
 .../org/apache/camel/dsl/yaml/RestTest.groovy      |   21 +
 .../routes/rest-allowable-values-dsl.yaml          |   19 +
 dsl/camel-yaml-dsl/pom.xml                         |    2 +-
 dsl/pom.xml                                        |    2 +-
 etc/pom.xml                                        |    2 +-
 init/camel-bundle-plugin/pom.xml                   |    2 +-
 init/pom.xml                                       |    2 +-
 jakarta/rewrite.java                               |    6 +-
 parent/pom.xml                                     |   67 +-
 pom.xml                                            |    8 +-
 test-infra/camel-test-infra-activemq/pom.xml       |    2 +-
 test-infra/camel-test-infra-arangodb/pom.xml       |    2 +-
 test-infra/camel-test-infra-artemis/pom.xml        |    2 +-
 test-infra/camel-test-infra-aws-common/pom.xml     |    2 +-
 test-infra/camel-test-infra-aws-v2/pom.xml         |    2 +-
 test-infra/camel-test-infra-azure-common/pom.xml   |    2 +-
 .../camel-test-infra-azure-storage-blob/pom.xml    |    2 +-
 .../pom.xml                                        |    2 +-
 .../camel-test-infra-azure-storage-queue/pom.xml   |    2 +-
 test-infra/camel-test-infra-cassandra/pom.xml      |    2 +-
 test-infra/camel-test-infra-chatscript/pom.xml     |    2 +-
 test-infra/camel-test-infra-common/pom.xml         |    2 +-
 test-infra/camel-test-infra-consul/pom.xml         |    2 +-
 test-infra/camel-test-infra-couchbase/pom.xml      |    2 +-
 test-infra/camel-test-infra-couchdb/pom.xml        |    2 +-
 .../camel-test-infra-dispatch-router/pom.xml       |    2 +-
 test-infra/camel-test-infra-elasticsearch/pom.xml  |    2 +-
 test-infra/camel-test-infra-etcd3/pom.xml          |    2 +-
 test-infra/camel-test-infra-fhir/pom.xml           |    2 +-
 test-infra/camel-test-infra-ftp/pom.xml            |    2 +-
 test-infra/camel-test-infra-google-pubsub/pom.xml  |    2 +-
 .../camel-test-infra-hashicorp-vault/pom.xml       |    2 +-
 .../HashicorpVaultLocalContainerService.java       |    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 +-
 .../services/InfinispanLocalContainerService.java  |    2 +-
 test-infra/camel-test-infra-jdbc/pom.xml           |    2 +-
 test-infra/camel-test-infra-jetty/pom.xml          |    2 +-
 test-infra/camel-test-infra-kafka/pom.xml          |    2 +-
 .../kafka/services/ContainerLocalKafkaService.java |    2 +-
 .../RedpandaTransactionsEnabledContainer.java      |    2 +-
 .../camel-test-infra-messaging-common/pom.xml      |    2 +-
 .../camel-test-infra-microprofile-lra/pom.xml      |    2 +-
 test-infra/camel-test-infra-minio/pom.xml          |    2 +-
 test-infra/camel-test-infra-mongodb/pom.xml        |    2 +-
 test-infra/camel-test-infra-mosquitto/pom.xml      |    2 +-
 test-infra/camel-test-infra-nats/pom.xml           |    2 +-
 test-infra/camel-test-infra-openldap/pom.xml       |    2 +-
 test-infra/camel-test-infra-parent/pom.xml         |    2 +-
 test-infra/camel-test-infra-postgres/pom.xml       |    2 +-
 test-infra/camel-test-infra-pulsar/pom.xml         |    2 +-
 test-infra/camel-test-infra-rabbitmq/pom.xml       |    2 +-
 test-infra/camel-test-infra-redis/pom.xml          |    2 +-
 test-infra/camel-test-infra-solr/pom.xml           |    2 +-
 test-infra/camel-test-infra-xmpp/pom.xml           |    2 +-
 test-infra/camel-test-infra-zookeeper/pom.xml      |    2 +-
 test-infra/pom.xml                                 |    2 +-
 tests/camel-itest-cdi/pom.xml                      |    2 +-
 tests/camel-itest-jms2/pom.xml                     |    2 +-
 tests/camel-itest-standalone/pom.xml               |    2 +-
 tests/camel-itest/pom.xml                          |    2 +-
 .../camel/itest/jetty/JettyRestRedirectTest.java   |    5 +
 .../FromJmsToJdbcIdempotentConsumerToJmsTest.java  |  150 +-
 ...FromJmsToJdbcIdempotentConsumerToJmsXaTest.java |    2 +-
 tests/camel-partial-classpath-test/pom.xml         |    2 +-
 tests/camel-typeconverterscan-test/pom.xml         |    2 +-
 tests/pom.xml                                      |    2 +-
 .../camel-validator-test-resources/pom.xml         |    2 +-
 tests/test-bundles/mock-javamail_1.7/pom.xml       |    2 +-
 tests/test-bundles/pom.xml                         |    2 +-
 tooling/camel-tooling-model/pom.xml                |    2 +-
 tooling/camel-tooling-util/pom.xml                 |    2 +-
 .../camel/tooling/util/CamelVersionHelper.java     |   56 +-
 .../org/apache/camel/tooling/util/Version.java     |   92 +
 tooling/camel-util-json/pom.xml                    |    2 +-
 tooling/maven/bom-generator-maven-plugin/pom.xml   |    2 +-
 .../maven/bom/generator/BomGeneratorMojo.java      |   10 +
 .../maven/camel-api-component-maven-plugin/pom.xml |    2 +-
 tooling/maven/camel-component-maven-plugin/pom.xml |    2 +-
 .../pom.xml                                        |    2 +-
 .../java/org/apache/camel/maven/XmlHelper.java     |   26 +-
 tooling/maven/camel-javadoc-plugin/pom.xml         |    2 +-
 tooling/maven/camel-maven-plugin/pom.xml           |    2 +-
 tooling/maven/camel-package-maven-plugin/pom.xml   |    2 +-
 .../packaging/ModelXmlParserGeneratorMojo.java     |   25 +-
 .../camel/maven/packaging/PrepareCatalogMojo.java  |    2 +-
 .../camel/maven/packaging/SchemaGeneratorMojo.java |   47 +-
 .../camel/maven/packaging/SupportLevelHelper.java  |   11 +-
 .../maven/packaging/SupportLevelHelperTest.java    |   43 +
 tooling/maven/camel-resources-plugin/pom.xml       |    2 +-
 tooling/maven/camel-restdsl-openapi-plugin/pom.xml |    2 +-
 .../main/docs/camel-restdsl-openapi-plugin.adoc    |    6 +-
 .../generator/openapi/AbstractGenerateMojo.java    |    2 +-
 tooling/maven/camel-restdsl-swagger-plugin/pom.xml |    2 +-
 tooling/maven/pom.xml                              |    2 +-
 tooling/maven/sync-properties-maven-plugin/pom.xml |    2 +-
 .../main/resources/camel-dependencies-template.xml |    2 +-
 tooling/openapi-rest-dsl-generator/pom.xml         |    2 +-
 .../generator/openapi/RestDslXmlGenerator.java     |   10 +
 .../generator/openapi/RestDslYamlGenerator.java    |   25 +
 .../openapi/RestDslYamlGeneratorV302Test.java      |   62 +
 .../src/test/resources/OpenApiV302PetstoreYaml.txt |  231 +
 .../camel/generator/openapi/petstore-v3.yaml       |  819 +++
 tooling/parent/pom.xml                             |    2 +-
 tooling/pom.xml                                    |    2 +-
 tooling/spi-annotations/pom.xml                    |    2 +-
 tooling/swagger-rest-dsl-generator/pom.xml         |    2 +-
 .../generator/swagger/RestDslXmlGenerator.java     |   10 +
 2510 files changed, 13473 insertions(+), 27248 deletions(-)
 create mode 100644 .github/actions/install-packages/action.yml
 delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/activemq.json
 delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stomp.json
 delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/websocket.json
 delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/johnzon.json
 rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/{errorHandlerRef.json => refErrorHandler.json} (75%)
 create mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/value.json
 delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cli-connector.json
 delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/componentdsl.json
 delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/dsl-modeline.json
 delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/endpointdsl.json
 delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/groovy-dsl.json
 delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/java-joor-dsl.json
 delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/js-dsl.json
 delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jsh-dsl.json
 delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kamelet-main.json
 delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kotlin-dsl.json
 delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-cdi.json
 delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-spring.json
 delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/xml-jaxb-dsl.json
 delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/yaml-dsl.json
 delete mode 100644 components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQComponentConfigurer.java
 delete mode 100644 components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointConfigurer.java
 delete mode 100644 components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointUriFactory.java
 delete mode 100644 components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/converter/ActiveMQConverterLoader.java
 delete mode 100644 components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/converter/ActiveMQMessageConverterLoader.java
 delete mode 100644 components/camel-activemq/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
 delete mode 100644 components/camel-activemq/src/generated/resources/META-INF/services/org/apache/camel/component.properties
 delete mode 100644 components/camel-activemq/src/generated/resources/META-INF/services/org/apache/camel/component/activemq
 delete mode 100644 components/camel-activemq/src/generated/resources/META-INF/services/org/apache/camel/configurer/activemq-component
 delete mode 100644 components/camel-activemq/src/generated/resources/META-INF/services/org/apache/camel/configurer/activemq-endpoint
 delete mode 100644 components/camel-activemq/src/generated/resources/META-INF/services/org/apache/camel/send-dynamic/activemq
 delete mode 100644 components/camel-activemq/src/generated/resources/META-INF/services/org/apache/camel/urifactory/activemq-endpoint
 delete mode 100644 components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json
 delete mode 100644 components/camel-atom/src/generated/resources/META-INF/services/org/apache/camel/atom-adapter-factory
 delete mode 100644 components/camel-aws/camel-aws-cloudtrail/src/generated/resources/META-INF/services/org/apache/camel/component/aws-kinesis
 create mode 100644 components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2ClientHealthCheck.java
 delete mode 100644 components/camel-aws/camel-aws2-ecs/src/main/java/org/apache/camel/component/aws2/ecs/ECS2ComponentVerifierExtension.java
 create mode 100644 components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ClientHealthCheckProfileCredsTest.java
 create mode 100644 components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ClientHealthCheckStaticCredsTest.java
 delete mode 100644 components/camel-aws/camel-aws2-ecs/src/test/java/org/apache/camel/component/aws2/ecs/ECS2ComponentVerifierExtensionTest.java
 delete mode 100644 components/camel-cdi/src/generated/resources/org/apache/camel/cdi/xml/jaxb.index
 delete mode 100644 components/camel-cxf/camel-cxf-soap/src/generated/java/org/apache/camel/component/cxf/CxfEndpointUriFactory.java
 delete mode 100644 components/camel-cxf/src/generated/resources/META-INF/services/org/apache/camel/component.properties
 create mode 100644 components/camel-http/src/test/java/org/apache/camel/component/http/FollowRedirectTest.java
 delete mode 100644 components/camel-influxdb2/src/generated/java/org/apache/camel/component/influxdb2/InfluxDbComponentConfigurer.java
 delete mode 100644 components/camel-influxdb2/src/generated/java/org/apache/camel/component/influxdb2/InfluxDbEndpointConfigurer.java
 delete mode 100644 components/camel-influxdb2/src/generated/java/org/apache/camel/component/influxdb2/InfluxDbEndpointUriFactory.java
 delete mode 100644 components/camel-influxdb2/src/generated/java/org/apache/camel/component/influxdb2/converters/CamelInfluxDbConvertersLoader.java
 delete mode 100644 components/camel-johnzon/src/generated/java/org/apache/camel/component/johnzon/JohnzonDataFormatConfigurer.java
 delete mode 100644 components/camel-johnzon/src/generated/resources/META-INF/services/org/apache/camel/configurer/johnzon-dataformat
 delete mode 100644 components/camel-johnzon/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties
 delete mode 100644 components/camel-johnzon/src/generated/resources/META-INF/services/org/apache/camel/dataformat/johnzon
 delete mode 100644 components/camel-johnzon/src/generated/resources/org/apache/camel/component/johnzon/johnzon.json
 create mode 100644 components/camel-ldap/src/main/java/org/apache/camel/component/ldap/LdapHelper.java
 create mode 100644 components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CurrentSpanTest.java
 delete mode 100644 components/camel-soap/src/generated/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormatConfigurer.java
 copy core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/JsonApiDataFormatReifier.java => components/camel-spring-xml/src/test/java/org/apache/camel/spring/RoutePropertyTest.java (50%)
 copy core/camel-xml-io-util/pom.xml => components/camel-spring-xml/src/test/resources/org/apache/camel/spring/RoutePropertyTest.xml (55%)
 delete mode 100644 components/camel-stomp/src/generated/java/org/apache/camel/component/stomp/StompComponentConfigurer.java
 delete mode 100644 components/camel-stomp/src/generated/java/org/apache/camel/component/stomp/StompEndpointConfigurer.java
 delete mode 100644 components/camel-stomp/src/generated/java/org/apache/camel/component/stomp/StompEndpointUriFactory.java
 delete mode 100644 components/camel-stomp/src/generated/resources/META-INF/services/org/apache/camel/component.properties
 delete mode 100644 components/camel-stomp/src/generated/resources/META-INF/services/org/apache/camel/component/stomp
 delete mode 100644 components/camel-stomp/src/generated/resources/META-INF/services/org/apache/camel/configurer/stomp-component
 delete mode 100644 components/camel-stomp/src/generated/resources/META-INF/services/org/apache/camel/configurer/stomp-endpoint
 delete mode 100644 components/camel-stomp/src/generated/resources/META-INF/services/org/apache/camel/urifactory/stomp-endpoint
 delete mode 100644 components/camel-stomp/src/generated/resources/org/apache/camel/component/stomp/stomp.json
 delete mode 100644 components/camel-test/camel-test-cdi/src/generated/resources/META-INF/services/org/apache/camel/other.properties
 delete mode 100644 components/camel-test/camel-test-cdi/src/generated/resources/test-cdi.json
 delete mode 100644 components/camel-test/camel-test-spring/src/generated/resources/META-INF/services/org/apache/camel/other.properties
 delete mode 100644 components/camel-test/camel-test-spring/src/generated/resources/test-spring.json
 rename components/camel-wal/src/main/docs/{wal-docs.adoc => wal.adoc} (89%)
 delete mode 100644 components/camel-websocket/src/generated/java/org/apache/camel/component/websocket/WebsocketComponentConfigurer.java
 delete mode 100644 components/camel-websocket/src/generated/java/org/apache/camel/component/websocket/WebsocketEndpointConfigurer.java
 delete mode 100644 components/camel-websocket/src/generated/java/org/apache/camel/component/websocket/WebsocketEndpointUriFactory.java
 delete mode 100644 components/camel-websocket/src/generated/resources/META-INF/services/org/apache/camel/component.properties
 delete mode 100644 components/camel-websocket/src/generated/resources/META-INF/services/org/apache/camel/component/websocket
 delete mode 100644 components/camel-websocket/src/generated/resources/META-INF/services/org/apache/camel/configurer/websocket-component
 delete mode 100644 components/camel-websocket/src/generated/resources/META-INF/services/org/apache/camel/configurer/websocket-endpoint
 delete mode 100644 components/camel-websocket/src/generated/resources/META-INF/services/org/apache/camel/urifactory/websocket-endpoint
 delete mode 100644 components/camel-websocket/src/generated/resources/org/apache/camel/component/websocket/websocket.json
 create mode 100644 components/camel-zipfile/src/test/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategySplitTest.java
 create mode 100644 core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeAsyncProcessingStartedEvent.java
 delete mode 100644 core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DynamicRouterComponentBuilderFactory.java
 rename core/camel-core-model/src/generated/resources/org/apache/camel/model/errorhandler/{errorHandlerRef.json => refErrorHandler.json} (75%)
 create mode 100644 core/camel-core-model/src/generated/resources/org/apache/camel/model/value.json
 copy components/camel-openapi-java/src/test/java/org/apache/camel/openapi/User.java => core/camel-core-model/src/main/java/org/apache/camel/model/ValueDefinition.java (52%)
 rename core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/{ErrorHandlerRefDefinition.java => RefErrorHandlerDefinition.java} (86%)
 delete mode 100644 core/camel-core-xml/src/generated/resources/org/apache/camel/core/xml/export.json
 create mode 100644 core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateInterceptFromAndInterceptSendToEndpointWithPlaceholderTest.java
 copy core/camel-core/src/test/java/org/apache/camel/{processor/OnCompletionFailAndOkTest.java => model/RouteConfigurationOnCompletionTest.java} (63%)
 delete mode 100644 core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DynamicRouterEndpointBuilderFactory.java
 rename core/{camel-console/src/main/java/org/apache/camel/impl => camel-support/src/main/java/org/apache/camel/support}/console/AbstractDevConsole.java (92%)
 create mode 100644 core/camel-xml-io/src/test/resources/restAllowedValues.xml
 copy core/{camel-xml-io-util/pom.xml => camel-xml-io/src/test/resources/routeProperty.xml} (55%)
 delete mode 120000 docs/components/modules/ROOT/examples/json/activemq.json
 delete mode 120000 docs/components/modules/ROOT/examples/json/stomp.json
 delete mode 120000 docs/components/modules/ROOT/examples/json/websocket.json
 delete mode 120000 docs/components/modules/dataformats/examples/json/johnzon.json
 delete mode 120000 docs/components/modules/others/examples/json/test-cdi.json
 delete mode 120000 docs/components/modules/others/examples/json/test-spring.json
 delete mode 120000 docs/components/modules/others/pages/wal-docs.adoc
 create mode 120000 docs/components/modules/others/pages/wal.adoc
 create mode 100644 docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_21.adoc
 delete mode 100644 dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ActivemqComponentBuilderFactory.java
 delete mode 100644 dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/StompComponentBuilderFactory.java
 delete mode 100644 dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/WebsocketComponentBuilderFactory.java
 delete mode 100644 dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java
 rename dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/{JettyHttpEndpointBuilderFactory.java => JettyHttp11EndpointBuilderFactory.java} (88%)
 delete mode 100644 dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/StompEndpointBuilderFactory.java
 delete mode 100644 dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/WebsocketEndpointBuilderFactory.java
 copy core/camel-core-model/src/main/java/org/apache/camel/builder/RefErrorHandlerBuilder.java => dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyCommand.java (59%)
 create mode 100644 dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyCopy.java
 rename dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/{DependencyTree.java => DependencyList.java} (98%)
 create mode 100644 dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/BasePackageScanDownloadListener.java
 delete mode 100644 dsl/camel-kotlin-dsl/src/generated/resources/META-INF/services/org/apache/camel/other.properties
 delete mode 100644 dsl/camel-kotlin-dsl/src/generated/resources/kotlin-dsl.json
 create mode 100644 dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/routes/rest-allowable-values-dsl.yaml
 create mode 100644 tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/Version.java
 create mode 100644 tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/SupportLevelHelperTest.java
 create mode 100644 tooling/openapi-rest-dsl-generator/src/test/java/org/apache/camel/generator/openapi/RestDslYamlGeneratorV302Test.java
 create mode 100644 tooling/openapi-rest-dsl-generator/src/test/resources/OpenApiV302PetstoreYaml.txt
 create mode 100644 tooling/openapi-rest-dsl-generator/src/test/resources/org/apache/camel/generator/openapi/petstore-v3.yaml


[camel] 08/08: Regen

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 2057ec9808395aca90a2b077ff3f6e1d35a1d69e
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jan 2 13:09:17 2023 +0100

    Regen
---
 camel-dependencies/pom.xml                         |   32 +-
 .../org/apache/camel/catalog/components.properties |    3 -
 .../apache/camel/catalog/components/activemq.json  |  249 -
 .../org/apache/camel/catalog/components/jetty.json |    2 +-
 .../org/apache/camel/catalog/components/stomp.json |   54 -
 .../apache/camel/catalog/components/websocket.json |   73 -
 .../apache/camel/catalog/dataformats.properties    |    1 -
 .../apache/camel/catalog/dataformats/johnzon.json  |   23 -
 .../apache/camel/catalog/main/sensitive-keys.json  |    2 -
 .../org/apache/camel/catalog/others.properties     |   14 -
 .../apache/camel/catalog/others/cli-connector.json |   15 -
 .../apache/camel/catalog/others/componentdsl.json  |   15 -
 .../apache/camel/catalog/others/dsl-modeline.json  |   15 -
 .../apache/camel/catalog/others/endpointdsl.json   |   15 -
 .../apache/camel/catalog/others/groovy-dsl.json    |   15 -
 .../apache/camel/catalog/others/java-joor-dsl.json |   15 -
 .../org/apache/camel/catalog/others/js-dsl.json    |   15 -
 .../org/apache/camel/catalog/others/jsh-dsl.json   |   15 -
 .../apache/camel/catalog/others/kamelet-main.json  |   15 -
 .../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 -
 .../apache/camel/catalog/others/xml-jaxb-dsl.json  |   15 -
 .../org/apache/camel/catalog/others/yaml-dsl.json  |   15 -
 .../apache/camel/catalog/schemas/camel-spring.xsd  | 7536 +++++++-------------
 .../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 -
 .../services/org/apache/camel/atom-adapter-factory |    2 -
 .../services/org/apache/camel/component.properties |    2 +-
 .../org/apache/camel/component/aws-kinesis         |    2 -
 .../resources/org/apache/camel/cdi/xml/jaxb.index  |   15 -
 .../camel/component/cxf/CxfEndpointUriFactory.java |  110 -
 .../services/org/apache/camel/component.properties |    7 -
 .../camel/http/common/HttpConverterLoader.java     |   12 +-
 .../influxdb2/InfluxDbComponentConfigurer.java     |   61 -
 .../influxdb2/InfluxDbEndpointConfigurer.java      |   77 -
 .../influxdb2/InfluxDbEndpointUriFactory.java      |   76 -
 .../converters/CamelInfluxDbConvertersLoader.java  |   48 -
 .../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 -
 .../soap/SoapJaxbDataFormatConfigurer.java         |   24 -
 .../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 -
 .../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 -
 .../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 -
 .../dsl/DynamicRouterComponentBuilderFactory.java  |  146 -
 .../org/apache/camel/core/xml/export.json          |   22 -
 .../dsl/DynamicRouterEndpointBuilderFactory.java   |  554 --
 .../org/apache/camel/main/components.properties    |    3 -
 .../org/apache/camel/main/dataformats.properties   |    1 -
 .../java/org/apache/camel/util/SensitiveUtils.java |    6 +-
 .../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 -
 .../component/ComponentsBuilderFactory.java        |   41 -
 .../dsl/ActivemqComponentBuilderFactory.java       | 2172 ------
 .../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          |   68 +-
 .../builder/endpoint/EndpointBuilderFactory.java   |    5 +-
 .../camel/builder/endpoint/EndpointBuilders.java   |    5 +-
 .../builder/endpoint/StaticEndpointBuilders.java   |  173 +-
 .../endpoint/dsl/AMQPEndpointBuilderFactory.java   |  176 +-
 .../dsl/ActiveMQEndpointBuilderFactory.java        | 7132 ------------------
 .../dsl/BeanValidatorEndpointBuilderFactory.java   |   12 +-
 ...java => JettyHttp11EndpointBuilderFactory.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 ----
 .../camel-component-known-dependencies.properties  |    5 +-
 .../services/org/apache/camel/other.properties     |    7 -
 .../src/generated/resources/kotlin-dsl.json        |   15 -
 124 files changed, 3138 insertions(+), 21694 deletions(-)

diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index cf953cc8b2b..ea83398d508 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -80,13 +80,6 @@
     <californium-scandium-version>2.7.4</californium-scandium-version>
     <californium-version>2.7.2</californium-version>
     <camel.failsafe.forkTimeout>600</camel.failsafe.forkTimeout>
-    <camel.osgi.activator></camel.osgi.activator>
-    <camel.osgi.dynamic></camel.osgi.dynamic>
-    <camel.osgi.import.additional></camel.osgi.import.additional>
-    <camel.osgi.import.before.defaults></camel.osgi.import.before.defaults>
-    <camel.osgi.import.defaults></camel.osgi.import.defaults>
-    <camel.osgi.provide.capability></camel.osgi.provide.capability>
-    <camel.osgi.require.capability></camel.osgi.require.capability>
     <camel.surefire.fork.vmargs>-XX:+ExitOnOutOfMemoryError</camel.surefire.fork.vmargs>
     <camel.surefire.forkCount>1</camel.surefire.forkCount>
     <camel.surefire.forkTimeout>600</camel.surefire.forkTimeout>
@@ -96,7 +89,6 @@
     <camel.surefire.reuseForks>true</camel.surefire.reuseForks>
     <cassandra-driver-version>4.15.0</cassandra-driver-version>
     <cassandra-version>4.0.6</cassandra-version>
-    <jakarta-enterprise-cdi-api-version>4.0.1</jakarta-enterprise-cdi-api-version>
     <cglib-version>3.2.12</cglib-version>
     <checkstyle.failOnViolation>false</checkstyle.failOnViolation>
     <chunk-templates-version>3.6.2</chunk-templates-version>
@@ -185,12 +177,6 @@
     <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>
-    <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>4.0.1</glassfish-jaxb-runtime-version>
     <gmavenplus-plugin-version>1.13.1</gmavenplus-plugin-version>
@@ -258,10 +244,21 @@
     <jackson-version>1.9.12</jackson-version>
     <jackson2-module-scala-version>2.14.0</jackson2-module-scala-version>
     <jackson2-version>2.14.1</jackson2-version>
+    <jakarta-activation-version>2.0.1</jakarta-activation-version>
+    <jakarta-annotation-api-version>2.1.1</jakarta-annotation-api-version>
     <jakarta-api-version>2.1.5</jakarta-api-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-jms-api-version>3.1.0</jakarta-jms-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-jws-api-version>3.0.0</jakarta-jws-api-version>
     <jakarta-mail-version>2.0.1</jakarta-mail-version>
+    <jakarta-persistence-api-version>3.1.0</jakarta-persistence-api-version>
+    <jakarta-servlet-api-version>6.0.0</jakarta-servlet-api-version>
+    <jakarta-transaction-api-version>2.0.1</jakarta-transaction-api-version>
+    <jakarta-xml-bind-api-version>4.0.0</jakarta-xml-bind-api-version>
+    <jakarta-xml-soap-api-version>3.0.0</jakarta-xml-soap-api-version>
+    <jakarta-xml-ws-api-version>4.0.0</jakarta-xml-ws-api-version>
     <jakarta.el-version>3.0.3</jakarta.el-version>
     <jandex-version>3.0.3</jandex-version>
     <jansi-version>2.4.0</jansi-version>
@@ -274,15 +271,10 @@
     <javaparser-version>3.13.10</javaparser-version>
     <javapoet-version>1.11.1</javapoet-version>
     <javassist-version>3.28.0-GA</javassist-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>
-    <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>
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
index fe1b8342514..d32b8d5a199 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
@@ -1,4 +1,3 @@
-activemq
 amqp
 arangodb
 as2
@@ -310,7 +309,6 @@ sql-stored
 ssh
 stax
 stitch
-stomp
 stream
 string-template
 stub
@@ -333,7 +331,6 @@ vm
 weather
 web3j
 webhook
-websocket
 websocket-jsr356
 weka
 whatsapp
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
deleted file mode 100644
index db0e58a80bf..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/activemq.json
+++ /dev/null
@@ -1,249 +0,0 @@
-{
-  "component": {
-    "kind": "component",
-    "name": "activemq",
-    "title": "ActiveMQ",
-    "description": "Send messages to (or consume from) Apache ActiveMQ. This component extends the Camel JMS component.",
-    "deprecated": false,
-    "firstVersion": "1.0.0",
-    "label": "messaging",
-    "javaType": "org.apache.camel.component.activemq.ActiveMQComponent",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-activemq",
-    "version": "3.21.0-SNAPSHOT",
-    "scheme": "activemq",
-    "extendsScheme": "jms",
-    "syntax": "activemq:destinationType:destinationName",
-    "async": true,
-    "api": false,
-    "consumerOnly": false,
-    "producerOnly": false,
-    "lenientProperties": false
-  },
-  "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": "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 [...]
-    "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 [...]
-    "useSingleConnection": { "kind": "property", "displayName": "Use Single Connection", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": false, "description": "Enables or disables whether a Spring SingleConnectionFactory will be used so that when messages are sent to ActiveMQ from outside of a message consuming thread, pooling will be used ra [...]
-    "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 [...]
-    "artemisConsumerPriority": { "kind": "property", "displayName": "Artemis Consumer Priority", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Consumer priorities allow you to ensure that high priority consumers receive messages while they are active. N [...]
-    "asyncConsumer": { "kind": "property", "displayName": "Async Consumer", "group": "consumer", "label": "consumer", "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 the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may picku [...]
-    "autoStartup": { "kind": "property", "displayName": "Auto Startup", "group": "consumer", "label": "consumer", "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 the consumer container should auto-startup." },
-    "cacheLevel": { "kind": "property", "displayName": "Cache Level", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets the cache level by ID for the underlying JMS resources. See cacheLevelName option for more details." },
-    "cacheLevelName": { "kind": "property", "displayName": "Cache Level Name", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "CACHE_AUTO", "CACHE_CONNECTION", "CACHE_CONSUMER", "CACHE_NONE", "CACHE_SESSION" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "CACHE_AUTO", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "descri [...]
-    "concurrentConsumers": { "kind": "property", "displayName": "Concurrent Consumers", "group": "consumer", "label": "consumer", "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 default number of concurrent consumers when consuming from JMS (not for request\/reply [...]
-    "maxConcurrentConsumers": { "kind": "property", "displayName": "Max Concurrent Consumers", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the maximum number of concurrent consumers when consuming from JMS (not for request\/reply over JMS).  [...]
-    "replyToDeliveryPersistent": { "kind": "property", "displayName": "Reply To Delivery Persistent", "group": "consumer", "label": "consumer", "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 to use persistent delivery by default for replies." },
-    "selector": { "kind": "property", "displayName": "Selector", "group": "consumer", "label": "consumer", "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 selector to use" },
-    "subscriptionDurable": { "kind": "property", "displayName": "Subscription Durable", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Set whether to make the subscription durable. The durable subscription name to be used can b [...]
-    "subscriptionName": { "kind": "property", "displayName": "Subscription Name", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Set the name of a subscription to create. To be applied in case of a topic (pub-sub domain) with a shared or dura [...]
-    "subscriptionShared": { "kind": "property", "displayName": "Subscription Shared", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Set whether to make the subscription shared. The shared subscription name to be used can be sp [...]
-    "acceptMessagesWhileStopping": { "kind": "property", "displayName": "Accept Messages While Stopping", "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": "Specifies whether the consumer accept messages while i [...]
-    "allowReplyManagerQuickStop": { "kind": "property", "displayName": "Allow Reply Manager Quick Stop", "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 the DefaultMessageListenerContainer used in the [...]
-    "consumerType": { "kind": "property", "displayName": "Consumer Type", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.ConsumerType", "enum": [ "Simple", "Default", "Custom" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "Default", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The  [...]
-    "defaultTaskExecutorType": { "kind": "property", "displayName": "Default Task Executor Type", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.DefaultTaskExecutorType", "enum": [ "ThreadPool", "SimpleAsync" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": [...]
-    "eagerLoadingOfProperties": { "kind": "property", "displayName": "Eager Loading Of Properties", "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": "Enables eager loading of JMS properties and payload as soon  [...]
-    "eagerPoisonBody": { "kind": "property", "displayName": "Eager Poison Body", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "Poison JMS message due to ${exception.message}", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "If eagerLoadingOfProperties  [...]
-    "exposeListenerSession": { "kind": "property", "displayName": "Expose Listener Session", "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": "Specifies whether the listener session should be exposed when consu [...]
-    "replyToConsumerType": { "kind": "property", "displayName": "Reply To Consumer Type", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.ConsumerType", "enum": [ "Simple", "Default", "Custom" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "Default", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "des [...]
-    "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 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 [...]
-    "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 [...]
-    "preserveMessageQos": { "kind": "property", "displayName": "Preserve Message Qos", "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": "Set to true, if you want to send message using the QoS settings specified on the message, ins [...]
-    "priority": { "kind": "property", "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, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Values greater than 1 specify the message priority when sending (w [...]
-    "replyToConcurrentConsumers": { "kind": "property", "displayName": "Reply To Concurrent Consumers", "group": "producer", "label": "producer", "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 default number of concurrent consumers when doing request\/reply over  [...]
-    "replyToMaxConcurrentConsumers": { "kind": "property", "displayName": "Reply To Max Concurrent Consumers", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the maximum number of concurrent consumers when using request\/reply over JMS. See als [...]
-    "replyToOnTimeoutMaxConcurrentConsumers": { "kind": "property", "displayName": "Reply To On Timeout Max Concurrent Consumers", "group": "producer", "label": "producer", "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 maximum number of concurrent consumers for  [...]
-    "replyToOverride": { "kind": "property", "displayName": "Reply To Override", "group": "producer", "label": "producer", "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 in the JMS message, which overrides the setting of replyTo. It is useful  [...]
-    "replyToType": { "kind": "property", "displayName": "Reply To Type", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.ReplyToType", "enum": [ "Temporary", "Shared", "Exclusive" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows for explicitly specifying which kind of s [...]
-    "requestTimeout": { "kind": "property", "displayName": "Request Timeout", "group": "producer", "label": "producer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "20000", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The timeout for waiting for a reply when using the InOut Exchange Pattern (in milliseconds). The defau [...]
-    "timeToLive": { "kind": "property", "displayName": "Time To Live", "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": "When sending messages, specifies the time-to-live of the message (in milliseconds)." },
-    "allowAdditionalHeaders": { "kind": "property", "displayName": "Allow Additional Headers", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "This option is used to allow additional headers which may have values that are i [...]
-    "allowNullBody": { "kind": "property", "displayName": "Allow Null Body", "group": "producer (advanced)", "label": "producer,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": "Whether to allow sending messages with no body. If this option is false and the mess [...]
-    "alwaysCopyMessage": { "kind": "property", "displayName": "Always Copy Message", "group": "producer (advanced)", "label": "producer,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 true, Camel will always make a JMS message copy of the message when it i [...]
-    "correlationProperty": { "kind": "property", "displayName": "Correlation Property", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "When using InOut exchange pattern use this JMS property instead of JMSCorrelationID JMS [...]
-    "disableTimeToLive": { "kind": "property", "displayName": "Disable Time To Live", "group": "producer (advanced)", "label": "producer,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": "Use this option to force disabling time to live. For example when you do r [...]
-    "forceSendOriginalMessage": { "kind": "property", "displayName": "Force Send Original Message", "group": "producer (advanced)", "label": "producer,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": "When using mapJmsMessage=false Camel will create a new JMS m [...]
-    "includeSentJMSMessageID": { "kind": "property", "displayName": "Include Sent JMSMessage ID", "group": "producer (advanced)", "label": "producer,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": "Only applicable when sending to JMS destination using InOnly ( [...]
-    "replyToCacheLevelName": { "kind": "property", "displayName": "Reply To Cache Level Name", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "CACHE_AUTO", "CACHE_CONNECTION", "CACHE_CONSUMER", "CACHE_NONE", "CACHE_SESSION" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", " [...]
-    "replyToDestinationSelectorName": { "kind": "property", "displayName": "Reply To Destination Selector Name", "group": "producer (advanced)", "label": "producer,advanced", "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 Selector using the fixed name to be used so you c [...]
-    "streamMessageTypeEnabled": { "kind": "property", "displayName": "Stream Message Type Enabled", "group": "producer (advanced)", "label": "producer,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 StreamMessage type is enabled or not. Message p [...]
-    "allowAutoWiredConnectionFactory": { "kind": "property", "displayName": "Allow Auto Wired Connection Factory", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to auto-discover ConnectionFactory from the registry, if no connection factory has been configured. If only one instance of ConnectionFactory is found then it will be use [...]
-    "allowAutoWiredDestinationResolver": { "kind": "property", "displayName": "Allow Auto Wired Destination Resolver", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to auto-discover DestinationResolver from the registry, if no destination resolver has been configured. If only one instance of DestinationResolver is found then it w [...]
-    "allowSerializedHeaders": { "kind": "property", "displayName": "Allow Serialized Headers", "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": "Controls whether or not to include serialized headers. Applies only when transferExch [...]
-    "artemisStreamingEnabled": { "kind": "property", "displayName": "Artemis Streaming Enabled", "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 optimizing for Apache Artemis streaming mode. This can reduce memory overhe [...]
-    "asyncStartListener": { "kind": "property", "displayName": "Async Start 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 startup the JmsConsumer message listener asynchronously, when starting a route. Fo [...]
-    "asyncStopListener": { "kind": "property", "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." },
-    "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 [...]
-    "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": "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 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  [...]
-    "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  [...]
-    "pubSubNoLocal": { "kind": "property", "displayName": "Pub Sub No Local", "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 to inhibit the delivery of messages published by its own connection." },
-    "queueBrowseStrategy": { "kind": "property", "displayName": "Queue Browse Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.QueueBrowseStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom QueueBrowseStrategy when browsing queues" },
-    "receiveTimeout": { "kind": "property", "displayName": "Receive Timeout", "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": "The timeout for receiving messages (in milliseconds)." },
-    "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 [...]
-    "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  [...]
-    "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 [...]
-    "waitForProvisionCorrelationToBeUpdatedThreadSleepingTime": { "kind": "property", "displayName": "Wait For Provision Correlation To Be Updated Thread Sleeping Time", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "100", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Interval in  [...]
-    "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." },
-    "errorHandlerLoggingLevel": { "kind": "property", "displayName": "Error Handler Logging Level", "group": "logging", "label": "consumer,logging", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "WARN", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "desc [...]
-    "errorHandlerLogStackTrace": { "kind": "property", "displayName": "Error Handler Log Stack Trace", "group": "logging", "label": "consumer,logging", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows to control whether stacktraces should be logged or not, by the d [...]
-    "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.jms.JmsConfiguration", "configurationField": "configuration", "description": "Password to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." },
-    "username": { "kind": "property", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Username to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." },
-    "transacted": { "kind": "property", "displayName": "Transacted", "group": "transaction", "label": "transaction", "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 use transacted mode" },
-    "transactedInOut": { "kind": "property", "displayName": "Transacted In Out", "group": "transaction", "label": "transaction", "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 InOut operations (request reply) default to using transacted mode If this f [...]
-    "lazyCreateTransactionManager": { "kind": "property", "displayName": "Lazy Create Transaction Manager", "group": "transaction (advanced)", "label": "transaction,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": "If true, Camel will create a JmsTransactionMana [...]
-    "transactionManager": { "kind": "property", "displayName": "Transaction Manager", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "object", "javaType": "org.springframework.transaction.PlatformTransactionManager", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The Spring transaction manager to use." },
-    "transactionName": { "kind": "property", "displayName": "Transaction Name", "group": "transaction (advanced)", "label": "transaction,advanced", "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 name of the transaction to use." },
-    "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": "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": "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": "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" },
-    "CamelJmsRequestTimeout": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "long", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": "20_000", "description": "The timeout for waiting for a reply when using the InOut Exchange Pattern (in milliseconds).", "constantName": "org.apache.camel.component.jms.JmsConstants#JMS_REQUEST_TIMEOUT" }
-  },
-  "properties": {
-    "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": "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 [...]
-    "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 [...]
-    "artemisConsumerPriority": { "kind": "parameter", "displayName": "Artemis Consumer Priority", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Consumer priorities allow you to ensure that high priority consumers receive messages while they are active.  [...]
-    "asyncConsumer": { "kind": "parameter", "displayName": "Async Consumer", "group": "consumer", "label": "consumer", "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 the JmsConsumer processes the Exchange asynchronously. If enabled then the JmsConsumer may pick [...]
-    "autoStartup": { "kind": "parameter", "displayName": "Auto Startup", "group": "consumer", "label": "consumer", "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 the consumer container should auto-startup." },
-    "cacheLevel": { "kind": "parameter", "displayName": "Cache Level", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Sets the cache level by ID for the underlying JMS resources. See cacheLevelName option for more details." },
-    "cacheLevelName": { "kind": "parameter", "displayName": "Cache Level Name", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "CACHE_AUTO", "CACHE_CONNECTION", "CACHE_CONSUMER", "CACHE_NONE", "CACHE_SESSION" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "CACHE_AUTO", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "descr [...]
-    "concurrentConsumers": { "kind": "parameter", "displayName": "Concurrent Consumers", "group": "consumer", "label": "consumer", "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 default number of concurrent consumers when consuming from JMS (not for request\/repl [...]
-    "maxConcurrentConsumers": { "kind": "parameter", "displayName": "Max Concurrent Consumers", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the maximum number of concurrent consumers when consuming from JMS (not for request\/reply over JMS). [...]
-    "replyToDeliveryPersistent": { "kind": "parameter", "displayName": "Reply To Delivery Persistent", "group": "consumer", "label": "consumer", "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 to use persistent delivery by default for replies." },
-    "selector": { "kind": "parameter", "displayName": "Selector", "group": "consumer", "label": "consumer", "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 selector to use" },
-    "subscriptionDurable": { "kind": "parameter", "displayName": "Subscription Durable", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Set whether to make the subscription durable. The durable subscription name to be used can  [...]
-    "subscriptionName": { "kind": "parameter", "displayName": "Subscription Name", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Set the name of a subscription to create. To be applied in case of a topic (pub-sub domain) with a shared or dur [...]
-    "subscriptionShared": { "kind": "parameter", "displayName": "Subscription Shared", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Set whether to make the subscription shared. The shared subscription name to be used can be s [...]
-    "acceptMessagesWhileStopping": { "kind": "parameter", "displayName": "Accept Messages While Stopping", "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": "Specifies whether the consumer accept messages while  [...]
-    "allowReplyManagerQuickStop": { "kind": "parameter", "displayName": "Allow Reply Manager Quick Stop", "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 the DefaultMessageListenerContainer used in th [...]
-    "consumerType": { "kind": "parameter", "displayName": "Consumer Type", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.ConsumerType", "enum": [ "Simple", "Default", "Custom" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "Default", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The [...]
-    "defaultTaskExecutorType": { "kind": "parameter", "displayName": "Default Task Executor Type", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.DefaultTaskExecutorType", "enum": [ "ThreadPool", "SimpleAsync" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description" [...]
-    "destinationOptions": { "kind": "parameter", "displayName": "Destination Options", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.String>", "prefix": "destination.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "description": "Destination Options are a way to provide extended configuration options to a JMS consumer without having to extend the JM [...]
-    "eagerLoadingOfProperties": { "kind": "parameter", "displayName": "Eager Loading Of Properties", "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": "Enables eager loading of JMS properties and payload as soon [...]
-    "eagerPoisonBody": { "kind": "parameter", "displayName": "Eager Poison Body", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "Poison JMS message due to ${exception.message}", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "If eagerLoadingOfProperties [...]
-    "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." },
-    "exposeListenerSession": { "kind": "parameter", "displayName": "Expose Listener Session", "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": "Specifies whether the listener session should be exposed when cons [...]
-    "replyToConsumerType": { "kind": "parameter", "displayName": "Reply To Consumer Type", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.ConsumerType", "enum": [ "Simple", "Default", "Custom" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "Default", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "de [...]
-    "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 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  [...]
-    "preserveMessageQos": { "kind": "parameter", "displayName": "Preserve Message Qos", "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": "Set to true, if you want to send message using the QoS settings specified on the message, in [...]
-    "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, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Values greater than 1 specify the message priority when sending ( [...]
-    "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, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the default number of concurrent consumers when doing request\/reply over [...]
-    "replyToMaxConcurrentConsumers": { "kind": "parameter", "displayName": "Reply To Max Concurrent Consumers", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies the maximum number of concurrent consumers when using request\/reply over JMS. See al [...]
-    "replyToOnTimeoutMaxConcurrentConsumers": { "kind": "parameter", "displayName": "Reply To On Timeout Max Concurrent Consumers", "group": "producer", "label": "producer", "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 maximum number of concurrent consumers for [...]
-    "replyToOverride": { "kind": "parameter", "displayName": "Reply To Override", "group": "producer", "label": "producer", "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 in the JMS message, which overrides the setting of replyTo. It is useful [...]
-    "replyToType": { "kind": "parameter", "displayName": "Reply To Type", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.ReplyToType", "enum": [ "Temporary", "Shared", "Exclusive" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows for explicitly specifying which kind of  [...]
-    "requestTimeout": { "kind": "parameter", "displayName": "Request Timeout", "group": "producer", "label": "producer", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "20000", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The timeout for waiting for a reply when using the InOut Exchange Pattern (in milliseconds). The defa [...]
-    "timeToLive": { "kind": "parameter", "displayName": "Time To Live", "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": "When sending messages, specifies the time-to-live of the message (in milliseconds)." },
-    "allowAdditionalHeaders": { "kind": "parameter", "displayName": "Allow Additional Headers", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "This option is used to allow additional headers which may have values that are  [...]
-    "allowNullBody": { "kind": "parameter", "displayName": "Allow Null Body", "group": "producer (advanced)", "label": "producer,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": "Whether to allow sending messages with no body. If this option is false and the mes [...]
-    "alwaysCopyMessage": { "kind": "parameter", "displayName": "Always Copy Message", "group": "producer (advanced)", "label": "producer,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 true, Camel will always make a JMS message copy of the message when it  [...]
-    "correlationProperty": { "kind": "parameter", "displayName": "Correlation Property", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "When using InOut exchange pattern use this JMS property instead of JMSCorrelationID JM [...]
-    "disableTimeToLive": { "kind": "parameter", "displayName": "Disable Time To Live", "group": "producer (advanced)", "label": "producer,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": "Use this option to force disabling time to live. For example when you do  [...]
-    "forceSendOriginalMessage": { "kind": "parameter", "displayName": "Force Send Original Message", "group": "producer (advanced)", "label": "producer,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": "When using mapJmsMessage=false Camel will create a new JMS  [...]
-    "includeSentJMSMessageID": { "kind": "parameter", "displayName": "Include Sent JMSMessage ID", "group": "producer (advanced)", "label": "producer,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": "Only applicable when sending to JMS destination using InOnly  [...]
-    "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 [...]
-    "replyToCacheLevelName": { "kind": "parameter", "displayName": "Reply To Cache Level Name", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "CACHE_AUTO", "CACHE_CONNECTION", "CACHE_CONSUMER", "CACHE_NONE", "CACHE_SESSION" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration",  [...]
-    "replyToDestinationSelectorName": { "kind": "parameter", "displayName": "Reply To Destination Selector Name", "group": "producer (advanced)", "label": "producer,advanced", "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 Selector using the fixed name to be used so you  [...]
-    "streamMessageTypeEnabled": { "kind": "parameter", "displayName": "Stream Message Type Enabled", "group": "producer (advanced)", "label": "producer,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 StreamMessage type is enabled or not. Message  [...]
-    "allowSerializedHeaders": { "kind": "parameter", "displayName": "Allow Serialized Headers", "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": "Controls whether or not to include serialized headers. Applies only when transferExc [...]
-    "artemisStreamingEnabled": { "kind": "parameter", "displayName": "Artemis Streaming Enabled", "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 optimizing for Apache Artemis streaming mode. This can reduce memory overh [...]
-    "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, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Whether to startup the JmsConsumer message listener asynchronously, when starting a route. F [...]
-    "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": "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 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 [...]
-    "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 [...]
-    "pubSubNoLocal": { "kind": "parameter", "displayName": "Pub Sub No Local", "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 to inhibit the delivery of messages published by its own connection." },
-    "receiveTimeout": { "kind": "parameter", "displayName": "Receive Timeout", "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": "The timeout for receiving messages (in milliseconds)." },
-    "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 [...]
-    "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  [...]
-    "waitForProvisionCorrelationToBeUpdatedThreadSleepingTime": { "kind": "parameter", "displayName": "Wait For Provision Correlation To Be Updated Thread Sleeping Time", "group": "advanced", "label": "advanced", "required": false, "type": "duration", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "100", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Interval in [...]
-    "errorHandlerLoggingLevel": { "kind": "parameter", "displayName": "Error Handler Logging Level", "group": "logging", "label": "consumer,logging", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "WARN", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "des [...]
-    "errorHandlerLogStackTrace": { "kind": "parameter", "displayName": "Error Handler Log Stack Trace", "group": "logging", "label": "consumer,logging", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows to control whether stacktraces should be logged or not, by the  [...]
-    "password": { "kind": "parameter", "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.jms.JmsConfiguration", "configurationField": "configuration", "description": "Password to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." },
-    "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Username to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." },
-    "transacted": { "kind": "parameter", "displayName": "Transacted", "group": "transaction", "label": "transaction", "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 use transacted mode" },
-    "transactedInOut": { "kind": "parameter", "displayName": "Transacted In Out", "group": "transaction", "label": "transaction", "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 InOut operations (request reply) default to using transacted mode If this  [...]
-    "lazyCreateTransactionManager": { "kind": "parameter", "displayName": "Lazy Create Transaction Manager", "group": "transaction (advanced)", "label": "transaction,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": "If true, Camel will create a JmsTransactionMan [...]
-    "transactionManager": { "kind": "parameter", "displayName": "Transaction Manager", "group": "transaction (advanced)", "label": "transaction,advanced", "required": false, "type": "object", "javaType": "org.springframework.transaction.PlatformTransactionManager", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "The Spring transaction manager to use." },
-    "transactionName": { "kind": "parameter", "displayName": "Transaction Name", "group": "transaction (advanced)", "label": "transaction,advanced", "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 name of the transaction to use." },
-    "transactionTimeout": { "kind": "parameter", "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." }
-  }
-}
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 f5415ecf08f..61b553c0e95 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
@@ -8,7 +8,7 @@
     "deprecationNote": "",
     "firstVersion": "1.2.0",
     "label": "http",
-    "javaType": "org.apache.camel.component.jetty11.JettyHttpComponent9",
+    "javaType": "org.apache.camel.component.jetty11.JettyHttpComponent11",
     "supportLevel": "Stable",
     "groupId": "org.apache.camel",
     "artifactId": "camel-jetty",
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
deleted file mode 100644
index c368a86dab5..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/stomp.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "component": {
-    "kind": "component",
-    "name": "stomp",
-    "title": "Stomp",
-    "description": "Send and rececive messages to\/from STOMP (Simple Text Oriented Messaging Protocol) compliant message brokers.",
-    "deprecated": false,
-    "firstVersion": "2.12.0",
-    "label": "messaging",
-    "javaType": "org.apache.camel.component.stomp.StompComponent",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-stomp",
-    "version": "3.21.0-SNAPSHOT",
-    "scheme": "stomp",
-    "extendsScheme": "",
-    "syntax": "stomp:destination",
-    "async": true,
-    "api": false,
-    "consumerOnly": false,
-    "producerOnly": false,
-    "lenientProperties": false
-  },
-  "componentProperties": {
-    "brokerURL": { "kind": "property", "displayName": "Broker URL", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": "tcp:\/\/localhost:61613", "configurationClass": "org.apache.camel.component.stomp.StompConfiguration", "configurationField": "configuration", "description": "The URI of the Stomp broker to connect to" },
-    "customHeaders": { "kind": "property", "displayName": "Custom Headers", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Properties", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.stomp.StompConfiguration", "configurationField": "configuration", "description": "To set custom headers" },
-    "host": { "kind": "property", "displayName": "Host", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.stomp.StompConfiguration", "configurationField": "configuration", "description": "The virtual host name" },
-    "version": { "kind": "property", "displayName": "Version", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.stomp.StompConfiguration", "configurationField": "configuration", "description": "The stomp version (1.1, or 1.2)" },
-    "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 [...]
-    "configuration": { "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.stomp.StompConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "Component configuration." },
-    "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." },
-    "login": { "kind": "property", "displayName": "Login", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.stomp.StompConfiguration", "configurationField": "configuration", "description": "The username" },
-    "passcode": { "kind": "property", "displayName": "Passcode", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.stomp.StompConfiguration", "configurationField": "configuration", "description": "The password" },
-    "sslContextParameters": { "kind": "property", "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, "configurationClass": "org.apache.camel.component.stomp.StompConfiguration", "configurationField": "configuration", "description": "To configure security using SSLContextParameters" },
-    "useGlobalSslContextParameters": { "kind": "property", "displayName": "Use Global Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Enable usage of global SSL context parameters." }
-  },
-  "properties": {
-    "destination": { "kind": "path", "displayName": "Destination", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Name of the queue" },
-    "brokerURL": { "kind": "parameter", "displayName": "Broker URL", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "defaultValue": "tcp:\/\/localhost:61613", "configurationClass": "org.apache.camel.component.stomp.StompConfiguration", "configurationField": "configuration", "description": "The URI of the Stomp broker to connect to" },
-    "customHeaders": { "kind": "parameter", "displayName": "Custom Headers", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Properties", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.stomp.StompConfiguration", "configurationField": "configuration", "description": "To set custom headers" },
-    "host": { "kind": "parameter", "displayName": "Host", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.stomp.StompConfiguration", "configurationField": "configuration", "description": "The virtual host name" },
-    "version": { "kind": "parameter", "displayName": "Version", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.stomp.StompConfiguration", "configurationField": "configuration", "description": "The stomp version (1.1, or 1.2)" },
-    "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 [...]
-    "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." },
-    "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 [...]
-    "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." },
-    "login": { "kind": "parameter", "displayName": "Login", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.stomp.StompConfiguration", "configurationField": "configuration", "description": "The username" },
-    "passcode": { "kind": "parameter", "displayName": "Passcode", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.stomp.StompConfiguration", "configurationField": "configuration", "description": "The password" },
-    "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, "configurationClass": "org.apache.camel.component.stomp.StompConfiguration", "configurationField": "configuration", "description": "To configure security using SSLContextParameters" }
-  }
-}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/websocket.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/websocket.json
deleted file mode 100644
index e05f6f832c4..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/websocket.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-  "component": {
-    "kind": "component",
-    "name": "websocket",
-    "title": "Jetty Websocket",
-    "description": "Expose websocket endpoints using Jetty.",
-    "deprecated": false,
-    "firstVersion": "2.10.0",
-    "label": "websocket",
-    "javaType": "org.apache.camel.component.websocket.WebsocketComponent",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-websocket",
-    "version": "3.21.0-SNAPSHOT",
-    "scheme": "websocket",
-    "extendsScheme": "",
-    "syntax": "websocket:host:port\/resourceUri",
-    "async": false,
-    "api": false,
-    "consumerOnly": false,
-    "producerOnly": false,
-    "lenientProperties": false
-  },
-  "componentProperties": {
-    "host": { "kind": "property", "displayName": "Host", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "0.0.0.0", "description": "The hostname. The default value is 0.0.0.0" },
-    "port": { "kind": "property", "displayName": "Port", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "9292", "description": "The port number. The default value is 9292" },
-    "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 [...]
-    "staticResources": { "kind": "property", "displayName": "Static Resources", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Set a resource path for static resources (such as .html files etc). The resources can be loaded from classpath, if you prefix with classpath:, otherwise the resources is loaded from file system or from JAR files. For example to [...]
-    "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 [...]
-    "enableJmx": { "kind": "property", "displayName": "Enable Jmx", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If this option is true, Jetty JMX support will be enabled for this endpoint. See Jetty JMX support for more details." },
-    "maxThreads": { "kind": "property", "displayName": "Max Threads", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "To set a value for maximum number of threads in server thread pool. MaxThreads\/minThreads or threadPool fields are required due to switch to Jetty9. The default values for maxThreads is 1 2 noCores." },
-    "minThreads": { "kind": "property", "displayName": "Min Threads", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "To set a value for minimum number of threads in server thread pool. MaxThreads\/minThreads or threadPool fields are required due to switch to Jetty9. The default values for minThreads is 1." },
-    "subprotocol": { "kind": "property", "displayName": "Subprotocol", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "any", "description": "This is a comma-separated list of subprotocols that are supported by the application. The list is in priority order. The first subprotocol on this list that is proposed by the client is the one that will be accept [...]
-    "threadPool": { "kind": "property", "displayName": "Thread Pool", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.eclipse.jetty.util.thread.ThreadPool", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom thread pool for the server. MaxThreads\/minThreads or threadPool fields are required due to switch to Jetty9." },
-    "sslContextParameters": { "kind": "property", "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" },
-    "sslKeyPassword": { "kind": "property", "displayName": "Ssl Key Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "The password for the keystore when using SSL." },
-    "sslKeystore": { "kind": "property", "displayName": "Ssl Keystore", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "The path to the keystore." },
-    "sslPassword": { "kind": "property", "displayName": "Ssl Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "The password when using SSL." },
-    "useGlobalSslContextParameters": { "kind": "property", "displayName": "Use Global Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Enable usage of global SSL context parameters." }
-  },
-  "headers": {
-    "websocket.connectionKey": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Producer: Sends the message to all clients which are currently connected. You can use the sendToAll option on the endpoint instead of using this header. Consumer: Connection key identifying an individual client connection. You can save this and specify [...]
-    "websocket.sendToAll": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "Boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Sends the message to all clients which are currently connected. You can use the sendToAll option on the endpoint instead of using this header.", "constantName": "org.apache.camel.component.websocket.WebsocketConstants#SEND_TO_ALL" },
-    "websocket.remoteAddress": { "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "java.net.InetSocketAddress", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Remote address of the websocket session.", "constantName": "org.apache.camel.component.websocket.WebsocketConstants#REMOTE_ADDRESS" },
-    "websocket.subprotocol": { "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "If a specific subprotocol was negotiated, it will be specfied in this header. Note that if you specify the any subprotocol to be supported, and a client requests a specific subprotocol, the connection will be accepted without a specific subprot [...]
-    "websocket.relativePath": { "kind": "header", "displayName": "", "group": "consumer", "label": "consumer", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "If you specify a wildcard URI path for an endpoint, and a websocket client connects to that websocket endpoing, the relative path that the client specified will be provided in this header. For example, if you specified websocket:\/\/0.0.0.0:80 [...]
-  },
-  "properties": {
-    "host": { "kind": "path", "displayName": "Host", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "0.0.0.0", "description": "The hostname. The default value is 0.0.0.0. Setting this option on the component will use the component configured value as default." },
-    "port": { "kind": "path", "displayName": "Port", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "9292", "description": "The port number. The default value is 9292. Setting this option on the component will use the component configured value as default." },
-    "resourceUri": { "kind": "path", "displayName": "Resource Uri", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Name of the websocket channel to use" },
-    "maxBinaryMessageSize": { "kind": "parameter", "displayName": "Max Binary Message Size", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "-1", "description": "Can be used to set the size in bytes that the websocket created by the websocketServlet may be accept before closing. (Default is -1 - or unlimited)" },
-    "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": "Whether to enable session support which enables HttpSession for each http request." },
-    "staticResources": { "kind": "parameter", "displayName": "Static Resources", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Set a resource path for static resources (such as .html files etc). The resources can be loaded from classpath, if you prefix with classpath:, otherwise the resources is loaded from file system or from JAR files. For example t [...]
-    "subprotocol": { "kind": "parameter", "displayName": "Subprotocol", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "any", "description": "This is a comma-separated list of subprotocols that are supported by the application. The list is in priority order. The first subprotocol on this list that is proposed by the client is the one that will be accep [...]
-    "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 [...]
-    "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." },
-    "sendTimeout": { "kind": "parameter", "displayName": "Send Timeout", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "30000", "description": "Timeout in millis when sending to a websocket channel. The default timeout is 30000 (30 seconds)." },
-    "sendToAll": { "kind": "parameter", "displayName": "Send To All", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "description": "To send to all websocket subscribers. Can be used to configure on endpoint level, instead of having to use the WebsocketConstants.SEND_TO_ALL header on the message." },
-    "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 [...]
-    "bufferSize": { "kind": "parameter", "displayName": "Buffer Size", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "8192", "description": "Set the buffer size of the websocketServlet, which is also the max frame byte size (default 8192)" },
-    "maxIdleTime": { "kind": "parameter", "displayName": "Max Idle Time", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "300000", "description": "Set the time in ms that the websocket created by the websocketServlet may be idle before closing. (default is 300000)" },
-    "maxTextMessageSize": { "kind": "parameter", "displayName": "Max Text Message Size", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "Can be used to set the size in characters that the websocket created by the websocketServlet may be accept before closing." },
-    "minVersion": { "kind": "parameter", "displayName": "Min Version", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "13", "description": "Can be used to set the minimum protocol version accepted for the websocketServlet. (Default 13 - the RFC6455 version)" },
-    "allowedOrigins": { "kind": "parameter", "displayName": "Allowed Origins", "group": "cors", "label": "cors", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The CORS allowed origins. Use to allow all." },
-    "crossOriginFilterOn": { "kind": "parameter", "displayName": "Cross Origin Filter On", "group": "cors", "label": "cors", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to enable CORS" },
-    "filterPath": { "kind": "parameter", "displayName": "Filter Path", "group": "cors", "label": "cors", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Context path for filtering CORS" },
-    "enableJmx": { "kind": "parameter", "displayName": "Enable Jmx", "group": "monitoring", "label": "monitoring", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If this option is true, Jetty JMX support will be enabled for this endpoint. See Jetty JMX support for more details." },
-    "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/dataformats.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats.properties
index 36b9ab17fd1..5b26131dfdb 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats.properties
@@ -22,7 +22,6 @@ ical
 jackson
 jacksonXml
 jaxb
-johnzon
 jsonApi
 jsonb
 lzf
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/johnzon.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/johnzon.json
deleted file mode 100644
index 6cb523a4366..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/johnzon.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "dataformat": {
-    "kind": "dataformat",
-    "name": "johnzon",
-    "title": "JSON Johnzon",
-    "description": "Marshal POJOs to JSON and back using Johnzon",
-    "deprecated": false,
-    "firstVersion": "2.18.0",
-    "label": "dataformat,transformation,json",
-    "javaType": "org.apache.camel.component.johnzon.JohnzonDataFormat",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-johnzon",
-    "version": "3.21.0-SNAPSHOT",
-    "modelName": "json",
-    "modelJavaType": "org.apache.camel.model.dataformat.JsonDataFormat"
-  },
-  "properties": {
-    "objectMapper": { "kind": "attribute", "displayName": "Mapper", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Lookup and use the existing Mapper with the given id." },
-    "prettyPrint": { "kind": "attribute", "displayName": "Pretty Print", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To enable pretty printing output nicely formatted. Is by default false." },
-    "unmarshalType": { "kind": "attribute", "displayName": "Unmarshal Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Class name of the java type to use when unmarshalling" }
-  }
-}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json
index 488be216784..b3f7bf2ba9a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json
@@ -26,7 +26,6 @@
   "keypassword",
   "keystore",
   "keystorepassword",
-  "login",
   "oauthaccesstoken",
   "oauthappid",
   "oauthappsecret",
@@ -35,7 +34,6 @@
   "oauthtoken",
   "oauthtokenurl",
   "p12filename",
-  "passcode",
   "passphrase",
   "password",
   "privatekey",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
index a9c456619c4..e7c5c08d5f2 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
@@ -4,29 +4,19 @@ caffeine-lrucache
 cdi
 cdi-jta
 cdi-main
-cli-connector
 cloud
 cloudevents
 cluster
-componentdsl
 console
 csimple-joor
 debug
-dsl-modeline
 dsl-support
 elytron
-endpointdsl
-groovy-dsl
 headersmap
 health
 jasypt
-java-joor-dsl
 jfr
-js-dsl
-jsh-dsl
 jta
-kamelet-main
-kotlin-dsl
 leveldb
 lra
 mail-microsoft-oauth
@@ -51,15 +41,11 @@ spring-main
 spring-security
 spring-xml
 swagger-java
-test-cdi
 test-junit5
-test-spring
 test-spring-junit5
 threadpoolfactory-vertx
 tracing
 undertow-spring-security
 wal
 xml-io-dsl
-xml-jaxb-dsl
-yaml-dsl
 zipkin
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cli-connector.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cli-connector.json
deleted file mode 100644
index 968652cb325..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/cli-connector.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "other": {
-    "kind": "other",
-    "name": "cli-connector",
-    "title": "CLI Connector",
-    "description": "Runtime adapter connecting with Camel CLI",
-    "deprecated": false,
-    "firstVersion": "3.19.0",
-    "label": "tooling",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-cli-connector",
-    "version": "3.21.0-SNAPSHOT"
-  }
-}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/componentdsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/componentdsl.json
deleted file mode 100644
index 94d4db167e4..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/componentdsl.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "other": {
-    "kind": "other",
-    "name": "componentdsl",
-    "title": "Java Component DSL",
-    "description": "The Camel Component DSL",
-    "deprecated": false,
-    "firstVersion": "3.1.0",
-    "label": "dsl",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-componentdsl",
-    "version": "3.21.0-SNAPSHOT"
-  }
-}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/dsl-modeline.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/dsl-modeline.json
deleted file mode 100644
index abd562bc15a..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/dsl-modeline.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "other": {
-    "kind": "other",
-    "name": "dsl-modeline",
-    "title": "DSL Modeline",
-    "description": "Camel DSL Camel K modeline",
-    "deprecated": false,
-    "firstVersion": "3.16.0",
-    "label": "dsl",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-dsl-modeline",
-    "version": "3.21.0-SNAPSHOT"
-  }
-}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/endpointdsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/endpointdsl.json
deleted file mode 100644
index 534eabd0ff2..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/endpointdsl.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "other": {
-    "kind": "other",
-    "name": "endpointdsl",
-    "title": "Java Endpoint DSL",
-    "description": "The Camel Endpoint DSL",
-    "deprecated": false,
-    "firstVersion": "3.0.0",
-    "label": "dsl",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-endpointdsl",
-    "version": "3.21.0-SNAPSHOT"
-  }
-}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/groovy-dsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/groovy-dsl.json
deleted file mode 100644
index 67878e4649e..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/groovy-dsl.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "other": {
-    "kind": "other",
-    "name": "groovy-dsl",
-    "title": "Groovy Dsl",
-    "description": "Camel DSL with Groovy",
-    "deprecated": false,
-    "firstVersion": "3.9.0",
-    "label": "dsl",
-    "supportLevel": "Experimental",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-groovy-dsl",
-    "version": "3.21.0-SNAPSHOT"
-  }
-}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/java-joor-dsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/java-joor-dsl.json
deleted file mode 100644
index 124f3837080..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/java-joor-dsl.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "other": {
-    "kind": "other",
-    "name": "java-joor-dsl",
-    "title": "Java DSL (runtime compiled)",
-    "description": "Camel Java DSL with jOOR",
-    "deprecated": false,
-    "firstVersion": "3.9.0",
-    "label": "dsl",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-java-joor-dsl",
-    "version": "3.21.0-SNAPSHOT"
-  }
-}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/js-dsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/js-dsl.json
deleted file mode 100644
index eccc5639521..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/js-dsl.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "other": {
-    "kind": "other",
-    "name": "js-dsl",
-    "title": "JavaScript DSL",
-    "description": "Camel DSL with JavaScript",
-    "deprecated": false,
-    "firstVersion": "3.9.0",
-    "label": "dsl",
-    "supportLevel": "Experimental",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-js-dsl",
-    "version": "3.21.0-SNAPSHOT"
-  }
-}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jsh-dsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jsh-dsl.json
deleted file mode 100644
index 62d3cfe97f7..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jsh-dsl.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "other": {
-    "kind": "other",
-    "name": "jsh-dsl",
-    "title": "JavaShell DSL",
-    "description": "Camel DSL with JavaShell",
-    "deprecated": false,
-    "firstVersion": "3.15.0",
-    "label": "dsl",
-    "supportLevel": "Experimental",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-jsh-dsl",
-    "version": "3.21.0-SNAPSHOT"
-  }
-}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kamelet-main.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kamelet-main.json
deleted file mode 100644
index 07fe8dea3a1..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kamelet-main.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "other": {
-    "kind": "other",
-    "name": "kamelet-main",
-    "title": "Kamelet Main",
-    "description": "Main to run Kamelet standalone",
-    "deprecated": false,
-    "firstVersion": "3.11.0",
-    "label": "jbang",
-    "supportLevel": "Preview",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-kamelet-main",
-    "version": "3.21.0-SNAPSHOT"
-  }
-}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kotlin-dsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kotlin-dsl.json
deleted file mode 100644
index dbf72adb007..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kotlin-dsl.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "other": {
-    "kind": "other",
-    "name": "kotlin-dsl",
-    "title": "Kotlin DSL",
-    "description": "Camel DSL with Kotlin",
-    "deprecated": false,
-    "firstVersion": "3.9.0",
-    "label": "dsl",
-    "supportLevel": "Experimental",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-kotlin-dsl",
-    "version": "3.21.0-SNAPSHOT"
-  }
-}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-cdi.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-cdi.json
deleted file mode 100644
index 5994f48e07b..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-cdi.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "other": {
-    "kind": "other",
-    "name": "test-cdi",
-    "title": "Test CDI",
-    "description": "Camel unit testing with CDI",
-    "deprecated": true,
-    "firstVersion": "2.17.0",
-    "label": "testing,java",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-test-cdi",
-    "version": "3.21.0-SNAPSHOT"
-  }
-}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-spring.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-spring.json
deleted file mode 100644
index 8228576c1df..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-spring.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "other": {
-    "kind": "other",
-    "name": "test-spring",
-    "title": "Test Spring",
-    "description": "Camel unit testing with Spring",
-    "deprecated": true,
-    "firstVersion": "2.10.0",
-    "label": "testing,java,spring",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-test-spring",
-    "version": "3.21.0-SNAPSHOT"
-  }
-}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/xml-jaxb-dsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/xml-jaxb-dsl.json
deleted file mode 100644
index 992ba950355..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/xml-jaxb-dsl.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "other": {
-    "kind": "other",
-    "name": "xml-jaxb-dsl",
-    "title": "XML DSL (legacy)",
-    "description": "Camel XML DSL with camel-xml-jaxb",
-    "deprecated": false,
-    "firstVersion": "3.9.0",
-    "label": "dsl",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-xml-jaxb-dsl",
-    "version": "3.21.0-SNAPSHOT"
-  }
-}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/yaml-dsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/yaml-dsl.json
deleted file mode 100644
index b1c7d3314c1..00000000000
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/yaml-dsl.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "other": {
-    "kind": "other",
-    "name": "yaml-dsl",
-    "title": "YAML DSL",
-    "description": "Camel DSL with YAML",
-    "deprecated": false,
-    "firstVersion": "3.9.0",
-    "label": "dsl",
-    "supportLevel": "Stable",
-    "groupId": "org.apache.camel",
-    "artifactId": "camel-yaml-dsl",
-    "version": "3.21.0-SNAPSHOT"
-  }
-}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index 7f805a6f603..6bc44641051 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -2,516 +2,414 @@
     
   <xs:element name="aggregate" type="tns:aggregateDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Aggregates many messages into a single message
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="any23" type="tns:any23DataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Extract RDF data from HTML documents.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="apiKey" type="tns:apiKeyDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Rest security basic auth definition
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="asn1" type="tns:asn1DataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Encode and decode data structures using Abstract Syntax Notation One (ASN.1).
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="avro" type="tns:avroDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Serialize and deserialize messages using Apache Avro binary data format.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="barcode" type="tns:barcodeDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Transform strings to various 1D/2D barcode bitmap formats and back.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="base64" type="tns:base64DataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Encode and decode data using Base64.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="basicAuth" type="tns:basicAuthDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Rest security basic auth definition
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="batch-config" type="tns:batchResequencerConfig">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Configures batch-processing resequence eip.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="bean" type="tns:beanDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Calls a Java bean
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="beanPostProcessor" type="tns:camelBeanPostProcessor">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Spring specific DefaultCamelBeanPostProcessor which uses Spring
 BeanPostProcessor to post process beans.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="bearerToken" type="tns:bearerTokenDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Rest security bearer token authentication definition
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="bindy" type="tns:bindyDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Marshal and unmarshal Java beans from and to flat payloads (such as CSV,
 delimited, fixed length formats, or FIX messages).
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="blacklistServiceFilter" type="tns:blacklistServiceCallServiceFilterConfiguration">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Deprecated: null
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="cachingServiceDiscovery" type="tns:cachingServiceCallServiceDiscoveryConfiguration">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Deprecated: null
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="camelContext" type="tns:camelContextFactoryBean">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 CamelContext using XML configuration.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="cbor" type="tns:cborDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Unmarshal a CBOR payload to POJO and back.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="choice" type="tns:choiceDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Route messages based on a series of predicates
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="circuitBreaker" type="tns:circuitBreakerDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Route messages in a fault tolerance way using Circuit Breaker
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="claimCheck" type="tns:claimCheckDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 The Claim Check EIP allows you to replace message content with a claim check (a
 unique key), which can be used to retrieve the message content at a later time.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="combinedServiceDiscovery" type="tns:combinedServiceCallServiceDiscoveryConfiguration">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Deprecated: null
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="combinedServiceFilter" type="tns:combinedServiceCallServiceFilterConfiguration">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Deprecated: null
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="constant" type="tns:constantExpression">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 A fixed value set only once during the route startup.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="consulServiceDiscovery" type="tns:consulServiceCallServiceDiscoveryConfiguration">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Deprecated: null
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="consumerTemplate" type="tns:camelConsumerTemplateFactoryBean">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Configures a ConsumerTemplate
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="contextScan" type="tns:contextScanDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Scans for Java org.apache.camel.builder.RouteBuilder instances in the context
 org.apache.camel.spi.Registry .
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="convertBodyTo" type="tns:convertBodyDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Converts the message body to another type
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="crypto" type="tns:cryptoDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Encrypt and decrypt messages using Java Cryptography Extension (JCE).
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="csimple" type="tns:cSimpleExpression">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Evaluate a compiled simple expression.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="csv" type="tns:csvDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Handle CSV (Comma Separated Values) payloads.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="custom" type="tns:customDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Delegate to a custom org.apache.camel.spi.DataFormat implementation via Camel
 registry.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="customLoadBalancer" type="tns:customLoadBalancerDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 To use a custom load balancer implementation.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="customServiceFilter" type="tns:customServiceCallServiceFilterConfiguration">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Deprecated: null
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="dataFormats" type="tns:dataFormatsDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Configure data formats.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="datasonnet" type="tns:datasonnetExpression">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 To use DataSonnet scripts for message transformations.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="deadLetterChannel" type="tns:deadLetterChannelDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Error handler with dead letter queue.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="defaultErrorHandler" type="tns:defaultErrorHandlerDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 The default error handler.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="defaultLoadBalancer" type="tns:defaultServiceCallServiceLoadBalancerConfiguration">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Deprecated: null
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="delay" type="tns:delayDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Delays processing for a specified length of time
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="delete" type="tns:deleteDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Rest DELETE command
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="description" type="tns:descriptionDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 To provide comments about the node.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="dnsServiceDiscovery" type="tns:dnsServiceCallServiceDiscoveryConfiguration">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Deprecated: null
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="doCatch" type="tns:catchDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Catches exceptions as part of a try, catch, finally block
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="doFinally" type="tns:finallyDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Path traversed when a try, catch, finally block exits
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="doTry" type="tns:tryDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Marks the beginning of a try, catch, finally block
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="dynamicRouter" type="tns:dynamicRouterDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Route messages based on dynamic rules
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="endpoint" type="tns:camelEndpointFactoryBean">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Camel endpoint configuration
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="enrich" type="tns:enrichDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Enriches a message with data from a secondary resource
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="errorHandler" nillable="true" type="xs:anyType">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Camel error handling.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="exchangeProperty" type="tns:exchangePropertyExpression">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Gets a property from the Exchange.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="expression" type="tns:expressionSubElementDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 A useful base class for an expression
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
@@ -519,242 +417,195 @@ A useful base class for an expression
     
   <xs:element name="failover" type="tns:failoverLoadBalancerDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 In case of failures the exchange will be tried on the next endpoint.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="faultToleranceConfiguration" type="tns:faultToleranceConfigurationDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 MicroProfile Fault Tolerance Circuit Breaker EIP configuration
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="fhirJson" type="tns:fhirJsonDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Marshall and unmarshall FHIR objects to/from JSON.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="fhirXml" type="tns:fhirXmlDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Marshall and unmarshall FHIR objects to/from XML.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="filter" type="tns:filterDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Filter out messages based using a predicate
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="flatpack" type="tns:flatpackDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Marshal and unmarshal Java lists and maps to/from flat files (such as CSV,
 delimited, or fixed length formats) using Flatpack library.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="fluentTemplate" type="tns:camelFluentProducerTemplateFactoryBean">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Configures a org.apache.camel.FluentProducerTemplate
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="from" type="tns:fromDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Act as a message source as input to a route
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="get" type="tns:getDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Rest GET command
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="globalOption" type="tns:globalOptionDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Models a string key/value pair for configuring some global options on a Camel
 context such as max debug log length.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="globalOptions" type="tns:globalOptionsDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Models a series of string key/value pairs for configuring some global options on
 a Camel context such as max debug log length.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="grok" type="tns:grokDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Unmarshal unstructured data to objects using Logstash based Grok patterns.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="groovy" type="tns:groovyExpression">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Evaluates a Groovy script.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="gzipDeflater" type="tns:gzipDeflaterDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Compress and decompress messages using java.util.zip.GZIPStream.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="head" type="tns:headDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Rest HEAD command
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="header" type="tns:headerExpression">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Gets a header from the Exchange.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="healthyServiceFilter" type="tns:healthyServiceCallServiceFilterConfiguration">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Deprecated: null
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="hl7" type="tns:hl7DataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Marshal and unmarshal HL7 (Health Care) model objects using the HL7 MLLP codec.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="hl7terser" type="tns:hl7TerserExpression">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Get the value of a HL7 message field specified by terse location specification
 syntax.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="ical" type="tns:icalDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Marshal and unmarshal iCal (.ics) documents to/from model objects.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="idempotentConsumer" type="tns:idempotentConsumerDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Filters out duplicate messages
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="inOnly" type="tns:inOnlyDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Deprecated: Marks the exchange pattern for the route to one way
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="inOut" type="tns:inOutDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Deprecated: Marks the exchange pattern for the route to request/reply
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="inputType" type="tns:inputTypeDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Set the expected data type of the input message. If the actual message type is
 different at runtime, camel look for a required Transformer and apply if exists.
 If validate attribute is true then camel applies Validator as well. Type name
@@ -764,387 +615,311 @@ consists of two parts, 'scheme' and 'name' connected with ':'. For Java type
 it works like a wildcard. If only 'xml' is specified, all the XML message
 matches. It's handy to add only one transformer/validator for all the
 transformation from/to XML.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="intercept" type="tns:interceptDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Intercepts a message at each step in the route
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="interceptFrom" type="tns:interceptFromDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Intercepts incoming messages
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="interceptSendToEndpoint" type="tns:interceptSendToEndpointDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Intercepts messages being sent to an endpoint
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="jacksonXml" type="tns:jacksonXMLDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Unmarshal an XML payloads to POJOs and back using XMLMapper extension of
 Jackson.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="jaxb" type="tns:jaxbDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Unmarshal XML payloads to POJOs and back using JAXB2 XML marshalling standard.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="jmxAgent" type="tns:camelJMXAgentDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 JMX configuration.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="joor" type="tns:joorExpression">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Evaluates a jOOR (Java compiled once at runtime) expression.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="jq" type="tns:jqExpression">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Evaluates a JQ expression against a JSON message body.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="js" type="tns:javaScriptExpression">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Evaluates a JavaScript expression.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="json" type="tns:jsonDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Marshal POJOs to JSON and back.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="jsonApi" type="tns:jsonApiDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Marshal and unmarshal JSON:API resources using JSONAPI-Converter library.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="jsonpath" type="tns:jsonPathExpression">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Evaluates a JSONPath expression against a JSON message body.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="jtaTransactionErrorHandler" type="tns:jtaTransactionErrorHandlerDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 JTA based transactional error handler (requires camel-jta).
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="kamelet" type="tns:kameletDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 To call Kamelets in special situations
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="keyStoreParameters" type="tns:keyStoreParametersFactoryBean">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Key store facility for cryptographic keys and certificates
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="kubernetesServiceDiscovery" type="tns:kubernetesServiceCallServiceDiscoveryConfiguration">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Deprecated: null
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="language" type="tns:languageExpression">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Evaluates a custom language.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="loadBalance" type="tns:loadBalanceDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Balances message processing among a number of nodes
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="loadBalancerConfiguration" type="tns:serviceCallServiceLoadBalancerConfiguration">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Deprecated: null
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="log" type="tns:logDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Logs the defined message to the logger
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="loop" type="tns:loopDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Processes a message multiple times
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="lzf" type="tns:lzfDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Compress and decompress streams using LZF deflate algorithm.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="marshal" type="tns:marshalDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Marshals data into a specified format for transmission over a transport or
 component
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="method" type="tns:methodCallExpression">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Calls a Java bean method.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="mimeMultipart" type="tns:mimeMultipartDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Marshal Camel messages with attachments into MIME-Multipart messages and back.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="multicast" type="tns:multicastDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Routes the same message to multiple paths either sequentially or in parallel.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="mutualTLS" type="tns:mutualTLSDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Rest security mutual TLS authentication definition
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="mvel" type="tns:mvelExpression">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Evaluates a MVEL template.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="noErrorHandler" type="tns:noErrorHandlerDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 To not use an error handler.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="oauth2" type="tns:oAuth2Definition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Rest security OAuth2 definition
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="ognl" type="tns:ognlExpression">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Evaluates an OGNL expression (Apache Commons OGNL).
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="onCompletion" type="tns:onCompletionDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Route to be executed when normal route processing completes
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="onException" type="tns:onExceptionDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Route to be executed when an exception is thrown
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="onFallback" type="tns:onFallbackDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Route to be executed when Circuit Breaker EIP executes fallback
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="openIdConnect" type="tns:openIdConnectDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Rest security OpenID Connect definition
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="optimisticLockRetryPolicy" type="tns:optimisticLockRetryPolicyDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 To configure optimistic locking
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="otherwise" type="tns:otherwiseDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Route to be executed when all other choices evaluate to false
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="outputType" type="tns:outputTypeDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Set the expected data type of the output message. If the actual message type is
 different at runtime, camel look for a required Transformer and apply if exists.
 If validate attribute is true then camel applies Validator as well. Type name
@@ -1154,1357 +929,1088 @@ consists of two parts, 'scheme' and 'name' connected with ':'. For Java type
 it works like a wildcard. If only 'xml' is specified, all the XML message
 matches. It's handy to add only one transformer/validator for all the XML-Java
 transformation.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="packageScan" type="tns:packageScanDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Scans for Java org.apache.camel.builder.RouteBuilder classes in java packages
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="param" type="tns:paramDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 To specify the rest operation parameters.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="passThroughServiceFilter" type="tns:passThroughServiceCallServiceFilterConfiguration">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Deprecated: null
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="patch" type="tns:patchDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Rest PATCH command
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="pausable" type="tns:pausableDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Pausable EIP to support resuming processing from last known offset.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="pgp" type="tns:pgpDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Encrypt and decrypt messages using Java Cryptographic Extension (JCE) and PGP.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="pipeline" type="tns:pipelineDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Routes the message to a sequence of processors.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="policy" type="tns:policyDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Defines a policy the route will use
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="pollEnrich" type="tns:pollEnrichDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Enriches messages with data polled from a secondary resource
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="post" type="tns:postDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Rest POST command
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="process" type="tns:processDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Calls a Camel processor
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="propertiesFunction" type="tns:camelPropertyPlaceholderFunctionDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Function to use with properties placeholder
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="propertiesLocation" type="tns:camelPropertyPlaceholderLocationDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Properties to use with properties placeholder
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="property" type="tns:propertyDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 A key value pair where the value is a literal value
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="propertyExpression" type="tns:propertyExpressionDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 A key value pair where the value is an expression.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="propertyPlaceholder" type="tns:camelPropertyPlaceholderDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Properties placeholder
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="protobuf" type="tns:protobufDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Serialize and deserialize Java objects using Google's Protocol buffers.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="put" type="tns:putDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Rest PUT command
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="python" type="tns:pythonExpression">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Evaluates a Python expression.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="random" type="tns:randomLoadBalancerDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 The destination endpoints are selected by random.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="recipientList" type="tns:recipientListDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Route messages to a number of dynamically specified recipients
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="redeliveryPolicy" type="tns:redeliveryPolicyDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 To configure re-delivery for error handling
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="redeliveryPolicyProfile" type="tns:camelRedeliveryPolicyFactoryBean">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Configuration of redelivery policy.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="ref" type="tns:refExpression">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Uses an existing expression from the registry.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="refErrorHandler" type="tns:refErrorHandlerDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 References to an existing or custom error handler.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="removeHeader" type="tns:removeHeaderDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Removes a named header from the message
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="removeHeaders" type="tns:removeHeadersDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Removes message headers whose name matches a specified pattern
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="removeProperties" type="tns:removePropertiesDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Removes message exchange properties whose name matches a specified pattern
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="removeProperty" type="tns:removePropertyDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Removes a named property from the message exchange
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="resequence" type="tns:resequenceDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Resequences (re-order) messages based on an expression
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="resilience4jConfiguration" type="tns:resilience4JConfigurationDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Resilience4j Circuit Breaker EIP configuration
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="responseHeader" type="tns:responseHeaderDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 To specify the rest operation response headers.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="responseMessage" type="tns:responseMessageDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 To specify the rest operation response messages.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="rest" type="tns:restDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Defines a rest service using the rest-dsl
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="restBinding" type="tns:restBindingDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 To configure rest binding
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="restConfiguration" type="tns:restConfigurationDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 To configure rest
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="restContext" type="tns:camelRestContextFactoryBean">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Configuration of REST services using rest-dsl using XML
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="restContextRef" type="tns:restContextRefDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 To refer to an XML file with rest services defined using the rest-dsl
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="restProperty" type="tns:restPropertyDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 A key value pair
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="rests" type="tns:restsDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 A series of rest services defined using the rest-dsl
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="resumable" type="tns:resumableDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Resume EIP to support resuming processing from last known offset.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="rollback" type="tns:rollbackDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Forces a rollback by stopping routing the message
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="roundRobin" type="tns:roundRobinLoadBalancerDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 The destination endpoints are selected in a round-robin fashion. This is a well
 known and classic policy, which spreads the load evenly.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="route" type="tns:routeDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 A Camel route
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="routeBuilder" type="tns:routeBuilderDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 To refer to a Java org.apache.camel.builder.RouteBuilder instance to use.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="routeConfiguration" type="tns:routeConfigurationDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Reusable configuration for Camel route(s).
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="routeConfigurationContext" type="tns:camelRouteConfigurationContextFactoryBean">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Configuration of route configurations using XML
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="routeConfigurationContextRef" type="tns:routeConfigurationContextRefDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 To refer to an XML file with route configuration defined using the xml-dsl
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="routeConfigurations" type="tns:routeConfigurationsDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 A series of route configurations
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="routeContext" type="tns:camelRouteContextFactoryBean">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Configuration of routes using XML
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="routeContextRef" type="tns:routeContextRefDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 To refer to an XML file with routes defined using the xml-dsl
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="routeController" type="tns:camelRouteControllerDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Route controller configuration.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="routeTemplate" type="tns:routeTemplateDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Defines a route template (parameterized routes)
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="routeTemplateContext" type="tns:camelRouteTemplateContextFactoryBean">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Configuration of route templates using XML
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="routeTemplateContextRef" type="tns:routeTemplateContextRefDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 To refer to an XML file with route templates defined using the xml-dsl
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="routeTemplates" type="tns:routeTemplatesDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 A series of route templates
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="routes" type="tns:routesDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 A series of Camel routes
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="routingSlip" type="tns:routingSlipDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Routes a message through a series of steps that are pre-determined (the slip)
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="rss" type="tns:rssDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Transform from ROME SyndFeed Java Objects to XML and vice-versa.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="saga" type="tns:sagaDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Enables Sagas on the route
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="sample" type="tns:samplingDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Extract a sample of the messages passing through a route
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="script" type="tns:scriptDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Executes a script from a language which does not change the message body.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="secureRandomParameters" type="tns:secureRandomParametersFactoryBean">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Cryptographically strong random number generator
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="security" type="tns:securityDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Rest security definition
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="securityDefinitions" type="tns:restSecuritiesDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 To configure rest security definitions.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="serviceCall" type="tns:serviceCallDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Deprecated: To call remote services
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="serviceCallConfiguration" type="tns:serviceCallConfigurationDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Deprecated: Remote service call configuration
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="serviceChooserConfiguration" type="tns:serviceCallServiceChooserConfiguration">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Deprecated: null
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="serviceDiscoveryConfiguration" type="tns:serviceCallServiceDiscoveryConfiguration">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Deprecated: null
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="serviceExpression" type="tns:serviceCallExpressionConfiguration">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Deprecated: null
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="serviceFilterConfiguration" type="tns:serviceCallServiceFilterConfiguration">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Deprecated: null
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="setBody" type="tns:setBodyDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Sets the contents of the message body
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="setExchangePattern" type="tns:setExchangePatternDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Sets the exchange pattern on the message exchange
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="setHeader" type="tns:setHeaderDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Sets the value of a message header
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="setProperty" type="tns:setPropertyDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Sets a named property on the message exchange
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="simple" type="tns:simpleExpression">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Evaluates a Camel simple expression.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="soap" type="tns:soapDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Marshal Java objects to SOAP messages and back.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="sort" type="tns:sortDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Sorts the contents of the message
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="spel" type="tns:spELExpression">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Evaluates a Spring expression (SpEL).
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="split" type="tns:splitDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Splits a single message into many sub-messages.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="springTransactionErrorHandler" type="tns:springTransactionErrorHandlerDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Spring based transactional error handler (requires camel-spring).
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="sslContextParameters" type="tns:sslContextParametersFactoryBean">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Secure socket protocol configuration
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="staticServiceDiscovery" type="tns:staticServiceCallServiceDiscoveryConfiguration">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Deprecated: null
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="step" type="tns:stepDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Routes the message to a sequence of processors which is grouped together as one
 logical name
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="sticky" type="tns:stickyLoadBalancerDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Sticky load balancing using an expression to calculate a correlation key to
 perform the sticky load balancing.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="stop" type="tns:stopDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Stops the processing of the current message
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="stream-config" type="tns:streamResequencerConfig">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Configures stream-processing resequence eip.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="streamCaching" type="tns:camelStreamCachingStrategyDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Stream caching configuration.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="swiftMt" type="tns:swiftMtDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Encode and decode SWIFT MT messages.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="swiftMx" type="tns:swiftMxDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Encode and decode SWIFT MX messages.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="syslog" type="tns:syslogDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Marshall SyslogMessages to RFC3164 and RFC5424 messages and back.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="tarFile" type="tns:tarFileDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Archive files into tarballs or extract files from tarballs.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="template" type="tns:camelProducerTemplateFactoryBean">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Configures a ProducerTemplate
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="templateBean" type="tns:routeTemplateBeanDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 A route template bean (local bean)
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="templateParameter" type="tns:routeTemplateParameterDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 A route template parameter
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="templatedRoute" type="tns:templatedRouteDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Defines a templated route (a route built from a route template)
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="templatedRouteBean" type="tns:templatedRouteBeanDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 A bean as input of a route template (local bean)
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="templatedRouteParameter" type="tns:templatedRouteParameterDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 An input parameter of a route template.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="templatedRoutes" type="tns:templatedRoutesDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 A series of templated routes
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="threadPool" type="tns:camelThreadPoolFactoryBean">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Configuration of thread pools
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="threadPoolProfile" type="tns:threadPoolProfileDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 To configure thread pools
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="threads" type="tns:threadsDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Specifies that all steps after this node are processed asynchronously
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="thrift" type="tns:thriftDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Serialize and deserialize messages using Apache Thrift binary data format.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="throttle" type="tns:throttleDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Controls the rate at which messages are passed to the next node in the route
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="throwException" type="tns:throwExceptionDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Throws an exception
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="tidyMarkup" type="tns:tidyMarkupDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Parse (potentially invalid) HTML into valid HTML or DOM.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="to" type="tns:toDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Sends the message to a static endpoint
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="toD" type="tns:toDynamicDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Sends the message to a dynamic endpoint
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="tokenize" type="tns:tokenizerExpression">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Tokenize text payloads using delimiter patterns.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="topic" type="tns:topicLoadBalancerDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Topic which sends to all destinations.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="transacted" type="tns:transactedDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Enables transaction on the route
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="transform" type="tns:transformDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Transforms the message body based on an expression
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="transformers" type="tns:transformersDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 To configure transformers.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="typeFilter" type="tns:yamlTypeFilterDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 null
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="univocityCsv" type="tns:uniVocityCsvDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Marshal and unmarshal Java objects from and to CSV (Comma Separated Values)
 using UniVocity Parsers.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="univocityFixed" type="tns:uniVocityFixedDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Marshal and unmarshal Java objects from and to fixed length records using
 UniVocity Parsers.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="univocityHeader" type="tns:uniVocityHeader">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 To configure headers for UniVocity data formats.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="univocityTsv" type="tns:uniVocityTsvDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Marshal and unmarshal Java objects from and to TSV (Tab-Separated Values)
 records using UniVocity Parsers.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="unmarshal" type="tns:unmarshalDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Converts the message data received from the wire into a format that Apache Camel
 processors can consume
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="validate" type="tns:validateDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Validates a message based on an expression
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="validators" type="tns:validatorsDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 To configure validators.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="value" type="tns:valueDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 A single value
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="weighted" type="tns:weightedLoadBalancerDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Uses a weighted load distribution ratio for each server with respect to others.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="when" type="tns:whenDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Triggers a route when the expression evaluates to true
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="wireTap" type="tns:wireTapDefinition">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Routes a copy of a message (or creates a new message) to a secondary destination
 while continue routing the original message.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="xmlSecurity" type="tns:xmlSecurityDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Encrypt and decrypt XML payloads using Apache Santuario.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="xpath" type="tns:xPathExpression">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Evaluates an XPath expression against an XML payload.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="xquery" type="tns:xQueryExpression">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Evaluates an XQuery expressions against an XML payload.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="xstream" type="tns:xStreamDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Deprecated: Marshal and unmarshal POJOs to/from XML using XStream library.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="xtokenize" type="tns:xmlTokenizerExpression">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Tokenize XML payloads.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="yaml" type="tns:yamlDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Marshal and unmarshal Java objects to and from YAML.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="zipDeflater" type="tns:zipDeflaterDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Compress and decompress streams using java.util.zip.Deflater and
 java.util.zip.Inflater.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="zipFile" type="tns:zipFileDataFormat">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Compression and decompress streams using java.util.zip.ZipStream.
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
   <xs:element name="zookeeperServiceDiscovery" type="tns:zooKeeperServiceCallServiceDiscoveryConfiguration">
     <xs:annotation>
-      <xs:documentation xml:lang="en">
-        <![CDATA[
+      <xs:documentation xml:lang="en"><![CDATA[
 Deprecated: null
-      ]]>
-      </xs:documentation>
+      ]]></xs:documentation>
     </xs:annotation>
   </xs:element>
     
@@ -2518,11 +2024,9 @@ Deprecated: null
                 
         <xs:attribute name="maximumCacheSize" type="xs:int">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets a custom maximum cache size to use in the backing cache pools.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -2542,11 +2046,9 @@ Sets a custom maximum cache size to use in the backing cache pools.
                 
         <xs:attribute name="camelContextId" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Id of CamelContext to use if there are multiple CamelContexts in the same JVM.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -2562,11 +2064,9 @@ Id of CamelContext to use if there are multiple CamelContexts in the same JVM.
         
     <xs:attribute name="id" type="xs:ID">
       <xs:annotation>
-        <xs:documentation xml:lang="en">
-          <![CDATA[
+        <xs:documentation xml:lang="en"><![CDATA[
 The id of this node.
-        ]]>
-        </xs:documentation>
+        ]]></xs:documentation>
       </xs:annotation>
     </xs:attribute>
       
@@ -2600,12 +2100,10 @@ The id of this node.
                 
         <xs:attribute name="uri" type="xs:string" use="required">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the URI to use to resolve the endpoint. Notice that additional options can
 be configured using a series of property.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -2621,21 +2119,17 @@ be configured using a series of property.
         
     <xs:attribute name="key" type="xs:string" use="required">
       <xs:annotation>
-        <xs:documentation xml:lang="en">
-          <![CDATA[
+        <xs:documentation xml:lang="en"><![CDATA[
 Property key.
-        ]]>
-        </xs:documentation>
+        ]]></xs:documentation>
       </xs:annotation>
     </xs:attribute>
         
     <xs:attribute name="value" type="xs:string" use="required">
       <xs:annotation>
-        <xs:documentation xml:lang="en">
-          <![CDATA[
+        <xs:documentation xml:lang="en"><![CDATA[
 Property value.
-        ]]>
-        </xs:documentation>
+        ]]></xs:documentation>
       </xs:annotation>
     </xs:attribute>
       
@@ -2651,21 +2145,17 @@ Property value.
                 
         <xs:attribute name="defaultEndpoint" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the default endpoint URI used by default for sending message exchanges.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="maximumCacheSize" type="xs:int">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets a custom maximum cache size to use in the backing cache pools.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -2685,21 +2175,17 @@ Sets a custom maximum cache size to use in the backing cache pools.
                 
         <xs:attribute name="defaultEndpoint" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the default endpoint URI used by default for sending message exchanges.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="maximumCacheSize" type="xs:int">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets a custom maximum cache size to use in the backing cache pools.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -2719,260 +2205,212 @@ Sets a custom maximum cache size to use in the backing cache pools.
                 
         <xs:attribute name="maximumRedeliveries" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the maximum number of times a message exchange will be redelivered. Setting
 a negative value will retry forever.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="redeliveryDelay" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the maximum redelivery delay. Use -1 if you wish to have no maximum.
 Default value: 1000
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="asyncDelayedRedelivery" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether asynchronous delayed redelivery is allowed. This is disabled by
 default. When enabled it allows Camel to schedule a future task for delayed
 redelivery which prevents current thread from blocking while waiting. Exchange
 which is transacted will however always use synchronous delayed redelivery
 because the transaction must execute in the same thread context. Default value:
 false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="backOffMultiplier" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the multiplier used to increase the delay between redeliveries if
 useExponentialBackOff is enabled. Default value: 2
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="useExponentialBackOff" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Enables/disables exponential backoff using the backOffMultiplier to increase the
 time between retries. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="collisionAvoidanceFactor" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the factor used for collision avoidance if enabled via
 useCollisionAvoidance. Default value: 0.15
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="useCollisionAvoidance" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Enables/disables collision avoidance which adds some randomization to the
 backoff timings to reduce contention probability. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="maximumRedeliveryDelay" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the maximum redelivery delay. Use -1 if you wish to have no maximum.
 Default value: 60000
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="retriesExhaustedLogLevel" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the logging level to use for log messages when retries have been exhausted.
 Default value: ERROR
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="retryAttemptedLogLevel" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the logging level to use for log messages when retries are attempted.
 Default value: DEBUG
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="retryAttemptedLogInterval" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the interval for log messages when retries are attempted. Default value: 0
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="logRetryAttempted" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether to log retry attempts. Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="logStackTrace" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether stack traces should be logged or not. Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="logRetryStackTrace" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether stack traces should be logged or not. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="logHandled" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether errors should be logged even if its handled. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="logNewException" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether errors should be logged when a new exception occurred during
 handling a previous exception. Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="logContinued" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether errors should be logged even if its continued. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="logExhausted" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether exhausted exceptions should be logged or not. Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="logExhaustedMessageHistory" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether to log exhausted errors including message history. Default value:
 false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="logExhaustedMessageBody" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether exhausted message body/headers should be logged with message
 history included. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="disableRedelivery" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Disables redelivery by setting maximum redeliveries to 0. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="delayPattern" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets an optional delay pattern to use instead of fixed delay.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="allowRedeliveryWhileStopping" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Controls whether to allow redelivery while stopping/shutting down a route that
 uses error handling. Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="exchangeFormatterRef" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the reference of the instance of org.apache.camel.spi.ExchangeFormatter to
 generate the log message from exchange.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -2992,93 +2430,75 @@ generate the log message from exchange.
                 
         <xs:attribute name="poolSize" type="xs:string" use="required">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the core pool size (threads to keep minimum in pool).
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="maxPoolSize" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the maximum pool size.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="keepAliveTime" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the keep alive time for inactive threads.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="timeUnit" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the time unit used for keep alive time. Default value: SECONDS
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="maxQueueSize" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the maximum number of tasks in the work queue. Use -1 for an unbounded
 queue.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="allowCoreThreadTimeOut" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether to allow core threads to timeout. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="rejectedPolicy" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the handler for tasks which cannot be executed by the thread pool. Default
 value: CallerRuns
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="threadName" type="xs:string" use="required">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To use a custom thread name / pattern.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="scheduled" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether to use a scheduled thread pool. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -3098,150 +2518,122 @@ Whether to use a scheduled thread pool. Default value: false
                 
         <xs:attribute name="disabled" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Disable JMI (default false). Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="onlyRegisterProcessorWithCustomId" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Only register processor if a custom id was defined for it. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="mbeanServerDefaultDomain" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 MBean server default domain name (default org.apache.camel). Default value:
 org.apache.camel
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="mbeanObjectDomainName" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 MBean object domain name (default org.apache.camel). Default value:
 org.apache.camel
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="usePlatformMBeanServer" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 A flag that indicates whether the platform mbean server should be used. Default
 value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="registerAlways" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 A flag that indicates whether to register mbeans always. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="registerNewRoutes" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 A flag that indicates whether to register mbeans when starting new routes.
 Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="statisticsLevel" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Level of granularity for performance statistics enabled. Default value: Default
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="mbeansLevel" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the mbeans registration level. The default value is Default. Default value:
 Default
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="loadStatisticsEnabled" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 A flag that indicates whether Load statistics is enabled. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="endpointRuntimeStatisticsEnabled" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 A flag that indicates whether endpoint runtime statistics is enabled. Default
 value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="includeHostName" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 A flag that indicates whether to include hostname in JMX MBean names. Default
 value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="useHostIPAddress" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 A flag that indicates whether to use hostname or IP Address in the service url.
 Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="mask" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 A flag that indicates whether to remove detected sensitive information (such as
 passwords) from MBean names and attributes. Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -3267,70 +2659,58 @@ passwords) from MBean names and attributes. Default value: true
                 
         <xs:attribute name="location" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 A list of locations to load properties. You can use comma to separate multiple
 locations. This option will override any default locations and only use the
 locations from this option.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="encoding" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Encoding to use when loading properties file from the file system or classpath.
 If no encoding has been set, then the properties files is loaded using
 ISO-8859-1 encoding (latin-1) as documented by
 java.util.Properties#load(java.io.InputStream).
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="ignoreMissingLocation" type="xs:boolean">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether to silently ignore if a location cannot be located, such as a properties
 file not found. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="nestedPlaceholder" type="xs:boolean">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether to support nested property placeholders. A nested placeholder, means
 that a placeholder, has also a placeholder, that should be resolved
 (recursively). Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="propertiesParserRef" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Reference to a custom PropertiesParser to be used.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="defaultFallbackEnabled" type="xs:boolean">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If false, the component does not attempt to find a default for the key by
 looking after the colon separator. Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -3350,11 +2730,9 @@ looking after the colon separator. Default value: true
                 
         <xs:attribute name="ref" type="xs:string" use="required">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Reference to the custom properties function to lookup in the registry.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -3374,31 +2752,25 @@ Reference to the custom properties function to lookup in the registry.
                 
         <xs:attribute name="resolver" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The resolver to use to locate the location. Default value: classpath
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="path" type="xs:string" use="required">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Property locations to use.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="optional" type="xs:boolean">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If the location is optional. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -3418,8 +2790,7 @@ If the location is optional. Default value: false
                 
         <xs:attribute name="supervising" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To enable using supervising route controller which allows Camel to startup and
 then the controller takes care of starting the routes in a safe manner. This can
 be used when you want to startup Camel despite a route may otherwise fail fast
@@ -3427,141 +2798,118 @@ during startup and cause Camel to fail to startup as well. By delegating the
 route startup to the supervising route controller then its manages the startup
 using a background thread. The controller allows to be configured with various
 settings to attempt to restart failing routes. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="includeRoutes" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Pattern for filtering routes to be included as supervised. The pattern is
 matching on route id, and endpoint uri for the route. Multiple patterns can be
 separated by comma. For example to include all kafka routes, you can say kafka:.
 And to include routes with specific route ids myRoute,myOtherRoute. The pattern
 supports wildcards and uses the matcher from
 org.apache.camel.support.PatternHelper#matchPattern.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="excludeRoutes" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Pattern for filtering routes to be excluded as supervised. The pattern is
 matching on route id, and endpoint uri for the route. Multiple patterns can be
 separated by comma. For example to exclude all JMS routes, you can say jms:. And
 to exclude routes with specific route ids mySpecialRoute,myOtherSpecialRoute.
 The pattern supports wildcards and uses the matcher from
 org.apache.camel.support.PatternHelper#matchPattern.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="threadPoolSize" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The number of threads used by the scheduled thread pool that are used for
 restarting routes. The pool uses 1 thread by default, but you can increase this
 to allow the controller to concurrently attempt to restart multiple routes in
 case more than one route has problems starting. Default value: 1
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="initialDelay" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Initial delay in milli seconds before the route controller starts, after
 CamelContext has been started.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="backOffDelay" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Backoff delay in millis when restarting a route that failed to startup. Default
 value: 2000
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="backOffMaxDelay" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Backoff maximum delay in millis when restarting a route that failed to startup.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="backOffMaxElapsedTime" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Backoff maximum elapsed time in millis, after which the backoff should be
 considered exhausted and no more attempts should be made.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="backOffMaxAttempts" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Backoff maximum number of attempts to restart a route that failed to startup.
 When this threshold has been exceeded then the controller will give up
 attempting to restart the route, and the route will remain as stopped.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="backOffMultiplier" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Backoff multiplier to use for exponential backoff. This is used to extend the
 delay between restart attempts. Default value: 1.0
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="unhealthyOnExhausted" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether to mark the route as unhealthy (down) when all restarting attempts
 (backoff) have failed and the route is not successfully started and the route
 manager is giving up. Setting this to true allows health checks to know about
 this and can report the Camel application as DOWN. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="loggingLevel" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the logging level used for logging route activity (such as starting and
 stopping routes). The default logging level is DEBUG. Default value: DEBUG
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -3581,8 +2929,7 @@ stopping routes). The default logging level is DEBUG. Default value: DEBUG
                 
         <xs:attribute name="enabled" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether stream caching is enabled or not. While stream types (like
 StreamSource, InputStream and Reader) are commonly used in messaging for
 performance reasons, they also have an important drawback: they can only be read
@@ -3592,138 +2939,115 @@ streamCachingSpoolEnabled=true, then, for large stream messages (over 128 KB by
 default) will be cached in a temporary file instead, and Camel will handle
 deleting the temporary file once the cached stream is no longer necessary.
 Default is true. Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="spoolEnabled" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To enable stream caching spooling to disk. This means, for large stream messages
 (over 128 KB by default) will be cached in a temporary file instead, and Camel
 will handle deleting the temporary file once the cached stream is no longer
 necessary. Default is false. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="spoolDirectory" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the spool (temporary) directory to use for overflow and spooling to disk.
 If no spool directory has been explicit configured, then a temporary directory
 is created in the java.io.tmpdir directory.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="spoolCipher" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets a cipher name to use when spooling to disk to write with encryption. By
 default the data is not encrypted.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="spoolThreshold" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Threshold in bytes when overflow to disk is activated. The default threshold is
 org.apache.camel.StreamCache#DEFAULT_SPOOL_THRESHOLD bytes (eg 128kb). Use -1 to
 disable overflow to disk. Default value: 131072
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="spoolUsedHeapMemoryThreshold" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets a percentage (1-99) of used heap memory threshold to activate spooling to
 disk.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="spoolUsedHeapMemoryLimit" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets what the upper bounds should be when spoolUsedHeapMemoryThreshold is in
 use.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="spoolRules" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Reference to one or more custom
 org.apache.camel.spi.StreamCachingStrategy.SpoolRule to use. Multiple rules can
 be separated by comma.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="bufferSize" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the buffer size to use when allocating in-memory buffers used for in-memory
 stream caches. The default size is
 org.apache.camel.util.IOHelper#DEFAULT_BUFFER_SIZE. Default value: 4096
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="removeSpoolDirectoryWhenStopping" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether to remove the temporary directory when stopping. This option is default
 true. Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="statisticsEnabled" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether statistics is enabled. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="anySpoolRules" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether if just any of the
 org.apache.camel.spi.StreamCachingStrategy.SpoolRule rules returns true then
 shouldSpoolCache(long) returns true. If this option is false, then all the
 org.apache.camel.spi.StreamCachingStrategy.SpoolRule must return true. The
 default value is false which means that all the rules must return true. Default
 value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -3783,44 +3107,36 @@ value: false
                 
         <xs:attribute name="type" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The optional type of the key store to load. See Appendix A in the Java
 Cryptography Architecture Standard Algorithm Name Documentation for more
 information on standard names.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="password" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The optional password for reading/opening/verifying the key store.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="provider" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The optional provider identifier for instantiating the key store.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="resource" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The optional file path, class path resource, or URL of the resource used to load
 the key store.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -3840,26 +3156,22 @@ the key store.
                 
         <xs:attribute name="algorithm" type="xs:string" use="required">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The Random Number Generator algorithm identifier for the SecureRandom factory
 method used to create the SecureRandom represented by this object's
 configuration. See Appendix A in the Java Cryptography Architecture API
 Specification and Reference guide for information about standard RNG algorithm
 names.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="provider" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The optional provider identifier for the SecureRandom factory method used to
 create the SecureRandom represented by this object's configuration.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -3955,12 +3267,10 @@ create the SecureRandom represented by this object's configuration.
                 
         <xs:attribute name="disabled" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether to disable this EIP from the route during build time. Once an EIP has
 been disabled then it cannot be enabled later at runtime. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
@@ -3984,11 +3294,9 @@ been disabled then it cannot be enabled later at runtime. Default value: false
         
     <xs:attribute name="id" type="xs:string">
       <xs:annotation>
-        <xs:documentation xml:lang="en">
-          <![CDATA[
+        <xs:documentation xml:lang="en"><![CDATA[
 Sets the id of this node.
-        ]]>
-        </xs:documentation>
+        ]]></xs:documentation>
       </xs:annotation>
     </xs:attribute>
       
@@ -4002,11 +3310,9 @@ Sets the id of this node.
                 
         <xs:attribute name="lang" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Deprecated: Language, such as en for english.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -4026,33 +3332,28 @@ Deprecated: Language, such as en for english.
                     
           <xs:element name="correlationExpression" type="tns:expressionSubElementDefinition">
             <xs:annotation>
-              <xs:documentation xml:lang="en">
-                <![CDATA[
+              <xs:documentation xml:lang="en"><![CDATA[
 The expression used to calculate the correlation key to use for aggregation. The
 Exchange which has the same correlation key is aggregated together. If the
 correlation key could not be evaluated an Exception is thrown. You can disable
 this by using the ignoreBadCorrelationKeys option.
-              ]]>
-              </xs:documentation>
+              ]]></xs:documentation>
             </xs:annotation>
           </xs:element>
                     
           <xs:element minOccurs="0" name="completionPredicate" type="tns:expressionSubElementDefinition">
             <xs:annotation>
-              <xs:documentation xml:lang="en">
-                <![CDATA[
+              <xs:documentation xml:lang="en"><![CDATA[
 A Predicate to indicate when an aggregated exchange is complete. If this is not
 specified and the AggregationStrategy object implements Predicate, the
 aggregationStrategy object will be used as the completionPredicate.
-              ]]>
-              </xs:documentation>
+              ]]></xs:documentation>
             </xs:annotation>
           </xs:element>
                     
           <xs:element minOccurs="0" name="completionTimeoutExpression" type="tns:expressionSubElementDefinition">
             <xs:annotation>
-              <xs:documentation xml:lang="en">
-                <![CDATA[
+              <xs:documentation xml:lang="en"><![CDATA[
 Time in millis that an aggregated exchange should be inactive before its
 complete (timeout). This option can be set as either a fixed value or using an
 Expression which allows you to evaluate a timeout dynamically - will use Long as
@@ -4064,21 +3365,18 @@ option to configure how frequently to run the checker. The timeout is an
 approximation and there is no guarantee that the a timeout is triggered exactly
 after the timeout value. It is not recommended to use very low timeout values or
 checker intervals.
-              ]]>
-              </xs:documentation>
+              ]]></xs:documentation>
             </xs:annotation>
           </xs:element>
                     
           <xs:element minOccurs="0" name="completionSizeExpression" type="tns:expressionSubElementDefinition">
             <xs:annotation>
-              <xs:documentation xml:lang="en">
-                <![CDATA[
+              <xs:documentation xml:lang="en"><![CDATA[
 Number of messages aggregated before the aggregation is complete. This option
 can be set as either a fixed value or using an Expression which allows you to
 evaluate a size dynamically - will use Integer as result. If both are set Camel
 will fallback to use the fixed value if the Expression result was null or 0.
-              ]]>
-              </xs:documentation>
+              ]]></xs:documentation>
             </xs:annotation>
           </xs:element>
                     
@@ -4226,147 +3524,124 @@ will fallback to use the fixed value if the Expression result was null or 0.
                 
         <xs:attribute name="parallelProcessing" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 When aggregated are completed they are being send out of the aggregator. This
 option indicates whether or not Camel should use a thread pool with multiple
 threads for concurrency. If no custom thread pool has been specified then Camel
 creates a default pool with 10 concurrent threads. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="optimisticLocking" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Turns on using optimistic locking, which requires the aggregationRepository
 being used, is supporting this by implementing
 org.apache.camel.spi.OptimisticLockingAggregationRepository . Default value:
 false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="executorService" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If using parallelProcessing you can specify a custom thread pool to be used. In
 fact also if you are not using parallelProcessing this custom thread pool is
 used to send out aggregated exchanges as well.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="timeoutCheckerExecutorService" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If using either of the completionTimeout, completionTimeoutExpression, or
 completionInterval options a background thread is created to check for the
 completion for every aggregator. Set this option to provide a custom thread pool
 to be used rather than creating a new thread for every aggregator.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="aggregateController" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To use a org.apache.camel.processor.aggregate.AggregateController to allow
 external sources to control this aggregator.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="aggregationRepository" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The AggregationRepository to use. Sets the custom aggregate repository to use.
 Will by default use
 org.apache.camel.processor.aggregate.MemoryAggregationRepository.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="aggregationStrategy" type="xs:string" use="required">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The AggregationStrategy to use. For example to lookup a bean with the name foo,
 the value is simply just #bean:foo. Configuring an AggregationStrategy is
 required, and is used to merge the incoming Exchange with the existing already
 merged exchanges. At first call the oldExchange parameter is null. On subsequent
 invocations the oldExchange contains the merged exchanges and newExchange is of
 course the new incoming Exchange.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="aggregationStrategyMethodName" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 This option can be used to explicit declare the method name to use, when using
 beans as the AggregationStrategy.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="aggregationStrategyMethodAllowNull" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If this option is false then the aggregate method is not used for the very first
 aggregation. If this option is true then null values is used as the oldExchange
 (at the very first aggregation), when using beans as the AggregationStrategy.
 Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="completionSize" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Number of messages aggregated before the aggregation is complete. This option
 can be set as either a fixed value or using an Expression which allows you to
 evaluate a size dynamically - will use Integer as result. If both are set Camel
 will fallback to use the fixed value if the Expression result was null or 0.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="completionInterval" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 A repeating period in millis by which the aggregator will complete all current
 aggregated exchanges. Camel has a background task which is triggered every
 period. You cannot use this option together with completionTimeout, only one of
 them can be used.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="completionTimeout" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Time in millis that an aggregated exchange should be inactive before its
 complete (timeout). This option can be set as either a fixed value or using an
 Expression which allows you to evaluate a timeout dynamically - will use Long as
@@ -4378,128 +3653,108 @@ option to configure how frequently to run the checker. The timeout is an
 approximation and there is no guarantee that the a timeout is triggered exactly
 after the timeout value. It is not recommended to use very low timeout values or
 checker intervals.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="completionTimeoutCheckerInterval" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Interval in millis that is used by the background task that checks for timeouts
 ( org.apache.camel.TimeoutMap ). By default the timeout checker runs every
 second. The timeout is an approximation and there is no guarantee that the a
 timeout is triggered exactly after the timeout value. It is not recommended to
 use very low timeout values or checker intervals. Default value: 1000
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="completionFromBatchConsumer" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Enables the batch completion mode where we aggregate from a
 org.apache.camel.BatchConsumer and aggregate the total number of exchanges the
 org.apache.camel.BatchConsumer has reported as total by checking the exchange
 property org.apache.camel.Exchange#BATCH_COMPLETE when its complete. This option
 cannot be used together with discardOnAggregationFailure. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="completionOnNewCorrelationGroup" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Enables completion on all previous groups when a new incoming correlation group.
 This can for example be used to complete groups with same correlation keys when
 they are in consecutive order. Notice when this is enabled then only 1
 correlation group can be in progress as when a new correlation group starts,
 then the previous groups is forced completed. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="eagerCheckCompletion" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Use eager completion checking which means that the completionPredicate will use
 the incoming Exchange. As opposed to without eager completion checking the
 completionPredicate will use the aggregated Exchange. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="ignoreInvalidCorrelationKeys" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If a correlation key cannot be successfully evaluated it will be ignored by
 logging a DEBUG and then just ignore the incoming Exchange. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="closeCorrelationKeyOnCompletion" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Closes a correlation key when its complete. Any late received exchanges which
 has a correlation key that has been closed, it will be defined and a
 ClosedCorrelationKeyException is thrown.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="discardOnCompletionTimeout" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Discards the aggregated message on completion timeout. This means on timeout the
 aggregated message is dropped and not sent out of the aggregator. Default value:
 false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="discardOnAggregationFailure" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Discards the aggregated message when aggregation failed (an exception was thrown
 from AggregationStrategy . This means the partly aggregated message is dropped
 and not sent out of the aggregator. This option cannot be used together with
 completionFromBatchConsumer. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="forceCompletionOnStop" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Indicates to complete all current aggregated exchanges when the context is
 stopped. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="completeAllOnStop" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Indicates to wait to complete all current and partial (pending) aggregated
 exchanges when the context is stopped. This also means that we will wait for all
 pending exchanges which are stored in the aggregation repository to complete so
@@ -4508,8 +3763,7 @@ using the memory based aggregation repository that is memory based only, and do
 not store data on disk. When this option is enabled, then the aggregator is
 waiting to complete all those exchanges before its stopped, when stopping
 CamelContext or the route using it. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -4583,22 +3837,18 @@ CamelContext or the route using it. Default value: false
                 
         <xs:attribute name="id" type="xs:ID">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the id of this node.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="trim" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether to trim the value to remove leading and trailing whitespaces and line
 breaks. Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -4614,52 +3864,42 @@ breaks. Default value: true
         
     <xs:attribute name="maximumRetries" type="xs:string">
       <xs:annotation>
-        <xs:documentation xml:lang="en">
-          <![CDATA[
+        <xs:documentation xml:lang="en"><![CDATA[
 Sets the maximum number of retries.
-        ]]>
-        </xs:documentation>
+        ]]></xs:documentation>
       </xs:annotation>
     </xs:attribute>
         
     <xs:attribute name="retryDelay" type="xs:string">
       <xs:annotation>
-        <xs:documentation xml:lang="en">
-          <![CDATA[
+        <xs:documentation xml:lang="en"><![CDATA[
 Sets the delay in millis between retries. Default value: 50
-        ]]>
-        </xs:documentation>
+        ]]></xs:documentation>
       </xs:annotation>
     </xs:attribute>
         
     <xs:attribute name="maximumRetryDelay" type="xs:string">
       <xs:annotation>
-        <xs:documentation xml:lang="en">
-          <![CDATA[
+        <xs:documentation xml:lang="en"><![CDATA[
 Sets the upper value of retry in millis between retries, when using exponential
 or random backoff. Default value: 1000
-        ]]>
-        </xs:documentation>
+        ]]></xs:documentation>
       </xs:annotation>
     </xs:attribute>
         
     <xs:attribute name="exponentialBackOff" type="xs:string">
       <xs:annotation>
-        <xs:documentation xml:lang="en">
-          <![CDATA[
+        <xs:documentation xml:lang="en"><![CDATA[
 Enable exponential backoff. Default value: true
-        ]]>
-        </xs:documentation>
+        ]]></xs:documentation>
       </xs:annotation>
     </xs:attribute>
         
     <xs:attribute name="randomBackOff" type="xs:string">
       <xs:annotation>
-        <xs:documentation xml:lang="en">
-          <![CDATA[
+        <xs:documentation xml:lang="en"><![CDATA[
 Enables random backoff. Default value: false
-        ]]>
-        </xs:documentation>
+        ]]></xs:documentation>
       </xs:annotation>
     </xs:attribute>
       
@@ -4675,39 +3915,32 @@ Enables random backoff. Default value: false
                 
         <xs:attribute name="ref" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets a reference to an exiting bean to use, which is looked up from the
 registry.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="method" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the method name on the bean to use.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="beanType" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the class name (fully qualified) of the bean to use.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="scope" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Scope of bean. When using singleton scope (default) the bean is created or
 looked up only once and reused for the lifetime of the endpoint. The bean should
 be thread-safe in case concurrent threads is calling the bean at the same time.
@@ -4721,8 +3954,7 @@ this is delegated to the bean registry such as Spring or CDI (if in use), which
 depends on their configuration can act as either singleton or prototype scope.
 So when using prototype scope then this depends on the bean registry
 implementation. Default value: Singleton
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -4754,14 +3986,12 @@ implementation. Default value: Singleton
             
       <xs:element minOccurs="0" name="script" type="xs:string">
         <xs:annotation>
-          <xs:documentation xml:lang="en">
-            <![CDATA[
+          <xs:documentation xml:lang="en"><![CDATA[
 The script to execute that creates the bean when using scripting languages. If
 the script use the prefix resource: such as
 resource:classpath:com/foo/myscript.groovy, resource:file:/var/myscript.groovy,
 then its loaded from the external resource.
-          ]]>
-          </xs:documentation>
+          ]]></xs:documentation>
         </xs:annotation>
       </xs:element>
           
@@ -4769,37 +3999,31 @@ then its loaded from the external resource.
         
     <xs:attribute name="name" type="xs:string" use="required">
       <xs:annotation>
-        <xs:documentation xml:lang="en">
-          <![CDATA[
+        <xs:documentation xml:lang="en"><![CDATA[
 Bean name.
-        ]]>
-        </xs:documentation>
+        ]]></xs:documentation>
       </xs:annotation>
     </xs:attribute>
         
     <xs:attribute name="type" type="xs:string" use="required">
       <xs:annotation>
-        <xs:documentation xml:lang="en">
-          <![CDATA[
+        <xs:documentation xml:lang="en"><![CDATA[
 What type to use for creating the bean. Can be one of:
 #class,#type,bean,groovy,joor,language,mvel,ognl. #class or #type then the bean
 is created via the fully qualified classname, such as #class:com.foo.MyBean The
 others are scripting languages that gives more power to create the bean with an
 inlined code in the script section, such as using groovy.
-        ]]>
-        </xs:documentation>
+        ]]></xs:documentation>
       </xs:annotation>
     </xs:attribute>
         
     <xs:attribute name="beanType" type="xs:string">
       <xs:annotation>
-        <xs:documentation xml:lang="en">
-          <![CDATA[
+        <xs:documentation xml:lang="en"><![CDATA[
 To set the type (fully qualified class name) of the returned bean created by the
 script. Knowing the type of the bean can be needed when dependency injection by
 type is in use, or when looking in registry via class type.
-        ]]>
-        </xs:documentation>
+        ]]></xs:documentation>
       </xs:annotation>
     </xs:attribute>
       
@@ -4815,23 +4039,19 @@ type is in use, or when looking in registry via class type.
                     
           <xs:element maxOccurs="unbounded" minOccurs="0" name="exception" type="xs:string">
             <xs:annotation>
-              <xs:documentation xml:lang="en">
-                <![CDATA[
+              <xs:documentation xml:lang="en"><![CDATA[
 The exception(s) to catch.
-              ]]>
-              </xs:documentation>
+              ]]></xs:documentation>
             </xs:annotation>
           </xs:element>
                     
           <xs:element minOccurs="0" name="onWhen" type="tns:whenDefinition">
             <xs:annotation>
-              <xs:documentation xml:lang="en">
-                <![CDATA[
+              <xs:documentation xml:lang="en"><![CDATA[
 Sets an additional predicate that should be true before the onCatch is
 triggered. To be used for fine grained controlling whether a thrown exception
 should be intercepted by this exception type or not.
-              ]]>
-              </xs:documentation>
+              ]]></xs:documentation>
             </xs:annotation>
           </xs:element>
                     
@@ -5203,13 +4423,11 @@ should be intercepted by this exception type or not.
                 
         <xs:attribute name="precondition" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Indicates whether this Choice EIP is in precondition mode or not. If so its
 branches (when/otherwise) are evaluated during startup to keep at runtime only
 the branch that matched. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -5527,12 +4745,10 @@ the branch that matched. Default value: false
                 
         <xs:attribute name="configuration" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Refers to a circuit breaker configuration (such as resillience4j, or
 microprofile-fault-tolerance) to use for configuring the circuit breaker EIP.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -5582,67 +4798,56 @@ microprofile-fault-tolerance) to use for configuring the circuit breaker EIP.
                 
         <xs:attribute name="circuitBreaker" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Refers to an existing io.github.resilience4j.circuitbreaker.CircuitBreaker
 instance to lookup and use from the registry. When using this, then any other
 circuit breaker options are not in use.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="config" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Refers to an existing io.github.resilience4j.circuitbreaker.CircuitBreakerConfig
 instance to lookup and use from the registry.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="failureRateThreshold" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Configures the failure rate threshold in percentage. If the failure rate is
 equal or greater than the threshold the CircuitBreaker transitions to open and
 starts short-circuiting calls. The threshold must be greater than 0 and not
 greater than 100. Default value is 50 percentage. Default value: 50
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="permittedNumberOfCallsInHalfOpenState" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Configures the number of permitted calls when the CircuitBreaker is half open.
 The size must be greater than 0. Default size is 10. Default value: 10
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="throwExceptionWhenHalfOpenOrOpenState" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether to throw io.github.resilience4j.circuitbreaker.CallNotPermittedException
 when the call is rejected due circuit breaker is half open or open. Default
 value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="slidingWindowSize" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Configures the size of the sliding window which is used to record the outcome of
 calls when the CircuitBreaker is closed. slidingWindowSize configures the size
 of the sliding window. Sliding window can either be count-based or time-based.
@@ -5654,81 +4859,69 @@ greater than 0. If the slidingWindowType is COUNT_BASED, the
 minimumNumberOfCalls cannot be greater than slidingWindowSize . If the
 slidingWindowType is TIME_BASED, you can pick whatever you want. Default
 slidingWindowSize is 100. Default value: 100
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="slidingWindowType" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Configures the type of the sliding window which is used to record the outcome of
 calls when the CircuitBreaker is closed. Sliding window can either be
 count-based or time-based. If slidingWindowType is COUNT_BASED, the last
 slidingWindowSize calls are recorded and aggregated. If slidingWindowType is
 TIME_BASED, the calls of the last slidingWindowSize seconds are recorded and
 aggregated. Default slidingWindowType is COUNT_BASED. Default value: COUNT_BASED
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="minimumNumberOfCalls" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Configures the minimum number of calls which are required (per sliding window
 period) before the CircuitBreaker can calculate the error rate. For example, if
 minimumNumberOfCalls is 10, then at least 10 calls must be recorded, before the
 failure rate can be calculated. If only 9 calls have been recorded the
 CircuitBreaker will not transition to open even if all 9 calls have failed.
 Default minimumNumberOfCalls is 100. Default value: 100
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="writableStackTraceEnabled" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Enables writable stack traces. When set to false, Exception.getStackTrace
 returns a zero length array. This may be used to reduce log spam when the
 circuit breaker is open as the cause of the exceptions is already known (the
 circuit breaker is short-circuiting calls). Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="waitDurationInOpenState" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Configures the wait duration (in seconds) which specifies how long the
 CircuitBreaker should stay open, before it switches to half open. Default value
 is 60 seconds. Default value: 60
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="automaticTransitionFromOpenToHalfOpenEnabled" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Enables automatic transition from OPEN to HALF_OPEN state once the
 waitDurationInOpenState has passed. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="slowCallRateThreshold" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Configures a threshold in percentage. The CircuitBreaker considers a call as
 slow when the call duration is greater than slowCallDurationThreshold Duration.
 When the percentage of slow calls is equal or greater the threshold, the
@@ -5736,20 +4929,17 @@ CircuitBreaker transitions to open and starts short-circuiting calls. The
 threshold must be greater than 0 and not greater than 100. Default value is 100
 percentage which means that all recorded calls must be slower than
 slowCallDurationThreshold. Default value: 100
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="slowCallDurationThreshold" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Configures the duration threshold (seconds) above which calls are considered as
 slow and increase the slow calls percentage. Default value is 60 seconds.
 Default value: 60
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -5783,146 +4973,120 @@ Default value: 60
                 
         <xs:attribute name="circuitBreaker" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Refers to an existing
 io.smallrye.faulttolerance.core.circuit.breaker.CircuitBreaker instance to
 lookup and use from the registry. When using this, then any other circuit
 breaker options are not in use.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="delay" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Control how long the circuit breaker stays open. The default is 5 seconds.
 Default value: 5000
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="successThreshold" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Controls the number of trial calls which are allowed when the circuit breaker is
 half-open. Default value: 1
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="requestVolumeThreshold" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Controls the size of the rolling window used when the circuit breaker is closed.
 Default value: 20
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="failureRatio" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Configures the failure rate threshold in percentage. If the failure rate is
 equal or greater than the threshold the CircuitBreaker transitions to open and
 starts short-circuiting calls. The threshold must be greater than 0 and not
 greater than 100. Default value is 50 percentage. Default value: 50
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="timeoutEnabled" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether timeout is enabled or not on the circuit breaker. Default is false.
 Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="timeoutDuration" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Configures the thread execution timeout. Default value is 1 second. Default
 value: 1000
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="timeoutPoolSize" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Configures the pool size of the thread pool when timeout is enabled. Default
 value is 10. Default value: 10
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="timeoutScheduledExecutorService" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 References to a custom thread pool to use when timeout is enabled.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="bulkheadEnabled" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether bulkhead is enabled or not on the circuit breaker. Default is false.
 Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="bulkheadMaxConcurrentCalls" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Configures the max amount of concurrent calls the bulkhead will support. Default
 value: 10
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="bulkheadWaitingTaskQueue" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Configures the task queue size for holding waiting tasks to be processed by the
 bulkhead. Default value: 10
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="bulkheadExecutorService" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 References to a custom thread pool to use when bulkhead is enabled.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -5942,34 +5106,29 @@ References to a custom thread pool to use when bulkhead is enabled.
                 
         <xs:attribute name="operation" type="xs:string" use="required">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The claim check operation to use. The following operations are supported: Get -
 Gets (does not remove) the claim check by the given key. GetAndRemove - Gets and
 removes the claim check by the given key. Set - Sets a new (will override if key
 already exists) claim check with the given key. Push - Sets a new claim check on
 the stack (does not use key). Pop - Gets the latest claim check from the stack
 (does not use key).
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="key" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To use a specific key for claim check id (for dynamic keys use simple language
 syntax as the key).
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="filter" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Specify a filter to control what data gets merged data back from the claim check
 repository. The following syntax is supported: body - to aggregate the message
 body attachments - to aggregate all the message attachments headers - to
@@ -5985,31 +5144,26 @@ the default mode) - - to exclude (exclude takes precedence over include) -- - to
 remove (remove takes precedence) For example to exclude a header name foo, and
 remove all headers starting with bar, -header:foo,--headers:bar Note you cannot
 have both include and exclude header:pattern at the same time.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="aggregationStrategy" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To use a custom AggregationStrategy instead of the default implementation.
 Notice you cannot use both custom aggregation strategy and configure data at the
 same time.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="aggregationStrategyMethodName" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 This option can be used to explicit declare the method name to use, when using
 POJOs as the AggregationStrategy.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -6031,21 +5185,17 @@ POJOs as the AggregationStrategy.
             
       <xs:element maxOccurs="unbounded" minOccurs="0" name="excludes" type="xs:string">
         <xs:annotation>
-          <xs:documentation xml:lang="en">
-            <![CDATA[
+          <xs:documentation xml:lang="en"><![CDATA[
 Exclude finding route builder from these java package names.
-          ]]>
-          </xs:documentation>
+          ]]></xs:documentation>
         </xs:annotation>
       </xs:element>
             
       <xs:element maxOccurs="unbounded" minOccurs="0" name="includes" type="xs:string">
         <xs:annotation>
-          <xs:documentation xml:lang="en">
-            <![CDATA[
+          <xs:documentation xml:lang="en"><![CDATA[
 Include finding route builder from these java package names.
-          ]]>
-          </xs:documentation>
+          ]]></xs:documentation>
         </xs:annotation>
       </xs:element>
           
@@ -6053,12 +5203,10 @@ Include finding route builder from these java package names.
         
     <xs:attribute name="includeNonSingletons" type="xs:string">
       <xs:annotation>
-        <xs:documentation xml:lang="en">
-          <![CDATA[
+        <xs:documentation xml:lang="en"><![CDATA[
 Whether to include non-singleton beans (prototypes) By default only singleton
 beans is included in the context scan. Default value: false
-        ]]>
-        </xs:documentation>
+        ]]></xs:documentation>
       </xs:annotation>
     </xs:attribute>
       
@@ -6074,34 +5222,28 @@ beans is included in the context scan. Default value: false
                 
         <xs:attribute name="type" type="xs:string" use="required">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The java type to convert to.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="mandatory" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 When mandatory then the conversion must return a value (cannot be null), if this
 is not possible then NoTypeConversionAvailableException is thrown. Setting this
 to false could mean conversion is not possible and the value is null. Default
 value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="charset" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To use a specific charset when converting.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -6185,33 +5327,27 @@ To use a specific charset when converting.
                 
         <xs:attribute name="asyncDelayed" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Enables asynchronous delay which means the thread will not block while delaying.
 Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="callerRunsWhenRejected" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether or not the caller should run the task when it was rejected by the thread
 pool. Is by default true. Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="executorService" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To use a custom Thread Pool if asyncDelay has been enabled.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -6281,29 +5417,24 @@ To use a custom Thread Pool if asyncDelay has been enabled.
                 
         <xs:attribute name="uriDelimiter" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the uri delimiter to use. Default value: ,
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="ignoreInvalidEndpoints" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Ignore the invalidate endpoint exception when try to create a producer with that
 endpoint. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="cacheSize" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the maximum size used by the org.apache.camel.spi.ProducerCache which is
 used to cache and reuse producers when using this dynamic router, when uris are
 reused. Beware that when using dynamic endpoints then it affects how well the
@@ -6318,8 +5449,7 @@ size can be set accordingly or rely on the default size (1000). If there is a
 mix of unique and used before dynamic endpoints, then setting a reasonable cache
 size can help reduce memory usage to avoid storing too many non frequent used
 producers.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -6389,71 +5519,60 @@ producers.
                 
         <xs:attribute name="aggregationStrategy" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the AggregationStrategy to be used to merge the reply from the external
 service, into a single outgoing message. By default Camel will use the reply
 from the external service as outgoing message.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="aggregationStrategyMethodName" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 This option can be used to explicit declare the method name to use, when using
 POJOs as the AggregationStrategy.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="aggregationStrategyMethodAllowNull" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If this option is false then the aggregate method is not used if there was no
 data to enrich. If this option is true then null values is used as the
 oldExchange (when no data to enrich), when using POJOs as the
 AggregationStrategy.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="aggregateOnException" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If this option is false then the aggregate method is not used if there was an
 exception thrown while trying to retrieve the data to enrich from the resource.
 Setting this option to true allows end users to control what to do if there was
 an exception in the aggregate method. For example to suppress the exception or
 set a custom message body etc. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="shareUnitOfWork" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Shares the org.apache.camel.spi.UnitOfWork with the parent and the resource
 exchange. Enrich will by default not share unit of work between the parent
 exchange and the resource exchange. This means the resource exchange has its own
 individual unit of work. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="cacheSize" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the maximum size used by the org.apache.camel.spi.ProducerCache which is
 used to cache and reuse producer when uris are reused. Beware that when using
 dynamic endpoints then it affects how well the cache can be utilized. If each
@@ -6467,30 +5586,25 @@ and endpoints and therefore the cache size can be set accordingly or rely on the
 default size (1000). If there is a mix of unique and used before dynamic
 endpoints, then setting a reasonable cache size can help reduce memory usage to
 avoid storing too many non frequent used producers.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="ignoreInvalidEndpoint" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Ignore the invalidate endpoint exception when try to create a producer with that
 endpoint. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="allowOptimisedComponents" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether to allow components to optimise enricher if they are
 org.apache.camel.spi.SendDynamicAware . Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -6540,18 +5654,15 @@ org.apache.camel.spi.SendDynamicAware . Default value: true
                 
         <xs:attribute name="deadLetterUri" type="xs:string" use="required">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The dead letter endpoint uri for the Dead Letter error handler.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="deadLetterHandleNewException" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether the dead letter channel should handle (and ignore) any new exception
 that may been thrown during sending the message to the dead letter endpoint. The
 default value is true which means any such kind of exception is handled and
@@ -6563,8 +5674,7 @@ of a new exception being thrown, then by setting this to false the new
 exceptions is propagated back and set on the org.apache.camel.Exchange , which
 allows the transaction to detect the exception, and rollback. Default value:
 true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -6588,39 +5698,32 @@ true
                 
         <xs:attribute name="loggerRef" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 References to a logger to use as logger for the error handler.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="level" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Logging level to use when using the logging error handler type. Default value:
 ERROR
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="logName" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Name of the logger to use for the logging error handler.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="useOriginalMessage" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Will use the original input org.apache.camel.Message (original body and headers)
 when an org.apache.camel.Exchange is moved to the dead letter queue. Notice:
 this only applies when all redeliveries attempt have failed and the
@@ -6649,15 +5752,13 @@ the splitted message); however these EIPs have an option named shareUnitOfWork
 which allows to combine with the parent unit of work in regard to error handling
 and therefore use the parent original message. By default this feature is off.
 Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="useOriginalBody" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Will use the original input org.apache.camel.Message body (original body only)
 when an org.apache.camel.Exchange is moved to the dead letter queue. Notice:
 this only applies when all redeliveries attempt have failed and the
@@ -6686,76 +5787,63 @@ the splitted message); however these EIPs have an option named shareUnitOfWork
 which allows to combine with the parent unit of work in regard to error handling
 and therefore use the parent original message. By default this feature is off.
 Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="onRedeliveryRef" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets a reference to a processor that should be processed before a redelivery
 attempt. Can be used to change the org.apache.camel.Exchange before its being
 redelivered.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="onExceptionOccurredRef" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets a reference to a processor that should be processed just after an exception
 occurred. Can be used to perform custom logging about the occurred exception at
 the exact time it happened. Important: Any exception thrown from this processor
 will be ignored.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="onPrepareFailureRef" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets a reference to a processor to prepare the org.apache.camel.Exchange before
 handled by the failure processor / dead letter channel. This allows for example
 to enrich the message before sending to a dead letter queue.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="retryWhileRef" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets a retry while predicate. Will continue retrying until the predicate
 evaluates to false.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="redeliveryPolicyRef" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets a reference to a RedeliveryPolicy to be used for redelivery settings.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="executorServiceRef" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets a reference to a thread pool to be used by the error handler.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -6789,260 +5877,212 @@ Sets a reference to a thread pool to be used by the error handler.
                 
         <xs:attribute name="maximumRedeliveries" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the maximum redeliveries x = redeliver at most x times 0 = no redeliveries
 -1 = redeliver forever.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="redeliveryDelay" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the initial redelivery delay. Default value: 1000
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="asyncDelayedRedelivery" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Allow asynchronous delayed redelivery. The route, in particular the consumer's
 component, must support the Asynchronous Routing Engine (e.g. seda). Default
 value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="backOffMultiplier" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the back off multiplier. Default value: 2.0
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="useExponentialBackOff" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Turn on exponential backk off. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="collisionAvoidanceFactor" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the collision avoidance factor. Default value: 0.15
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="useCollisionAvoidance" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Turn on collision avoidance. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="maximumRedeliveryDelay" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the maximum delay between redelivery. Default value: 60000
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="retriesExhaustedLogLevel" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the logging level to use when retries have been exhausted. Default value:
 ERROR
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="retryAttemptedLogLevel" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the logging level to use for logging retry attempts. Default value: DEBUG
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="retryAttemptedLogInterval" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the interval to use for logging retry attempts. Default value: 1
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="logRetryAttempted" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether retry attempts should be logged or not. Can be used to include or
 reduce verbose. Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="logStackTrace" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether stack traces should be logged. Can be used to include or reduce
 verbose. Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="logRetryStackTrace" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether stack traces should be logged when an retry attempt failed. Can be
 used to include or reduce verbose. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="logHandled" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether handled exceptions should be logged or not. Can be used to include
 or reduce verbose. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="logNewException" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether new exceptions should be logged or not. Can be used to include or
 reduce verbose. A new exception is an exception that was thrown while handling a
 previous exception. Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="logContinued" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether continued exceptions should be logged or not. Can be used to
 include or reduce verbose. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="logExhausted" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether exhausted exceptions should be logged or not. Can be used to
 include or reduce verbose. Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="logExhaustedMessageHistory" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether exhausted exceptions should be logged including message history or
 not (supports property placeholders). Can be used to include or reduce verbose.
 Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="logExhaustedMessageBody" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether exhausted message body should be logged including message history
 or not (supports property placeholders). Can be used to include or reduce
 verbose. Requires logExhaustedMessageHistory to be enabled. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="disableRedelivery" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Disables redelivery (same as setting maximum redeliveries to 0). Default value:
 false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="delayPattern" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the delay pattern with delay intervals.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="allowRedeliveryWhileStopping" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Controls whether to allow redelivery while stopping/shutting down a route that
 uses error handling. Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="exchangeFormatterRef" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the reference of the instance of org.apache.camel.spi.ExchangeFormatter to
 generate the log message from exchange.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -7090,24 +6130,20 @@ generate the log message from exchange.
                 
         <xs:attribute name="transactedPolicyRef" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The transacted policy to use that is configured for either Spring or JTA based
 transactions. If no policy has been configured then Camel will attempt to
 auto-discover.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="rollbackLoggingLevel" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the logging level to use for logging transactional rollback. This option is
 default WARN. Default value: WARN
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -7333,12 +6369,10 @@ default WARN. Default value: WARN
                 
         <xs:attribute name="statusPropertyName" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Name of exchange property to use for storing the status of the filtering.
 Setting this allows to know if the filter predicate evaluated as true or false.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -7512,11 +6546,9 @@ Setting this allows to know if the filter predicate evaluated as true or false.
                 
         <xs:attribute name="uri" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the URI of the endpoint to use.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -7532,21 +6564,17 @@ Sets the URI of the endpoint to use.
         
     <xs:attribute name="key" type="xs:string" use="required">
       <xs:annotation>
-        <xs:documentation xml:lang="en">
-          <![CDATA[
+        <xs:documentation xml:lang="en"><![CDATA[
 Global option key.
-        ]]>
-        </xs:documentation>
+        ]]></xs:documentation>
       </xs:annotation>
     </xs:attribute>
         
     <xs:attribute name="value" type="xs:string" use="required">
       <xs:annotation>
-        <xs:documentation xml:lang="en">
-          <![CDATA[
+        <xs:documentation xml:lang="en"><![CDATA[
 Global option value.
-        ]]>
-        </xs:documentation>
+        ]]></xs:documentation>
       </xs:annotation>
     </xs:attribute>
       
@@ -7764,29 +6792,24 @@ Global option value.
                 
         <xs:attribute name="idempotentRepository" type="xs:string" use="required">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the reference name of the message id repository.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="eager" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether to eagerly add the key to the idempotent repository or wait until
 the exchange is complete. Eager is default enabled. Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="completionEager" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether to complete the idempotent consumer eager or when the exchange is
 done. If this option is true to complete eager, then the idempotent consumer
 will trigger its completion when the exchange reached the end of the block of
@@ -7797,32 +6820,27 @@ will complete when the exchange is done being routed. So if the exchange is
 continued routed after the block ends, then whatever happens there also affect
 the state. For example if the exchange failed due to an exception, then the
 state of the idempotent consumer will be a rollback. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="skipDuplicate" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether to skip duplicates or not. The default behavior is to skip
 duplicates. A duplicate message would have the Exchange property
 org.apache.camel.Exchange#DUPLICATE_MESSAGE set to a Boolean#TRUE value. A none
 duplicate message will not have this property set. Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="removeOnFailure" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether to remove or keep the key on failure. The default behavior is to
 remove the key on failure. Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -7856,11 +6874,9 @@ remove the key on failure. Default value: true
                 
         <xs:attribute name="uri" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the uri of the endpoint to send to.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -7894,21 +6910,17 @@ Sets the uri of the endpoint to send to.
                 
         <xs:attribute name="urn" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The input type URN.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="validate" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether if validation is required for this input type. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -8082,12 +7094,10 @@ Whether if validation is required for this input type. Default value: false
                 
         <xs:attribute name="uri" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Intercept incoming messages from the uri or uri pattern. If this option is not
 configured, then all incoming messages is intercepted.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -8247,33 +7257,27 @@ configured, then all incoming messages is intercepted.
                 
         <xs:attribute name="uri" type="xs:string" use="required">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Intercept sending to the uri or uri pattern.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="skipSendToOriginalEndpoint" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If set to true then the message is not sent to the original endpoint. By default
 (false) the message is both intercepted and then sent to the original endpoint.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="afterUri" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 After sending to the endpoint then send the message to this uri which allows to
 process its result.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -8433,12 +7437,10 @@ process its result.
                 
         <xs:attribute name="name" type="xs:string" use="required">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Name of the Kamelet (templateId/routeId) to call. Options for the kamelet can be
 specified using uri syntax, eg mynamecount=4&type=gold.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -8630,11 +7632,9 @@ specified using uri syntax, eg mynamecount=4&type=gold.
                 
         <xs:attribute name="ref" type="xs:string" use="required">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Refers to the custom load balancer to lookup from the registry.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -8668,12 +7668,10 @@ Refers to the custom load balancer to lookup from the registry.
                     
           <xs:element maxOccurs="unbounded" minOccurs="0" name="exception" type="xs:string">
             <xs:annotation>
-              <xs:documentation xml:lang="en">
-                <![CDATA[
+              <xs:documentation xml:lang="en"><![CDATA[
 A list of class names for specific exceptions to monitor. If no exceptions are
 configured then all exceptions are monitored.
-              ]]>
-              </xs:documentation>
+              ]]></xs:documentation>
             </xs:annotation>
           </xs:element>
                   
@@ -8681,8 +7679,7 @@ configured then all exceptions are monitored.
                 
         <xs:attribute name="roundRobin" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether or not the failover load balancer should operate in round robin mode or
 not. If not, then it will always start from the first endpoint when a new
 message is to be processed. In other words it restart from the top for every
@@ -8691,15 +7688,13 @@ the next endpoint in a round robin fashion. You can also enable sticky mode
 together with round robin, if so then it will pick the last known good endpoint
 to use when starting the load balancing (instead of using the next when
 starting).
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="sticky" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether or not the failover load balancer should operate in sticky mode or not.
 If not, then it will always start from the first endpoint when a new message is
 to be processed. In other words it restart from the top for every message. If
@@ -8707,22 +7702,19 @@ sticky is enabled, then it keeps state and will continue with the last known
 good endpoint. You can also enable sticky mode together with round robin, if so
 then it will pick the last known good endpoint to use when starting the load
 balancing (instead of using the next when starting).
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="maximumFailoverAttempts" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 A value to indicate after X failover attempts we should exhaust (give up). Use
 -1 to indicate never give up and continuously try to failover. Use 0 to never
 failover. And use e.g. 3 to failover at most 3 times before giving up. his
 option can be used whether or not roundRobin is enabled or not. Default value:
 -1
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -8770,11 +7762,9 @@ option can be used whether or not roundRobin is enabled or not. Default value:
                     
           <xs:element name="correlationExpression" type="tns:expressionSubElementDefinition">
             <xs:annotation>
-              <xs:documentation xml:lang="en">
-                <![CDATA[
+              <xs:documentation xml:lang="en"><![CDATA[
 The correlation expression to use to calculate the correlation key.
-              ]]>
-              </xs:documentation>
+              ]]></xs:documentation>
             </xs:annotation>
           </xs:element>
                   
@@ -8810,35 +7800,29 @@ The correlation expression to use to calculate the correlation key.
                 
         <xs:attribute name="distributionRatio" type="xs:string" use="required">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The distribution ratio is a delimited String consisting on integer weights
 separated by delimiters for example 2,3,5. The distributionRatio must match the
 number of endpoints and/or processors specified in the load balancer list.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="distributionRatioDelimiter" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Delimiter used to specify the distribution ratio. The default value is ,
 (comma). Default value: ,
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="roundRobin" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To enable round robin mode. By default the weighted distribution mode is used.
 The default value is false. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -8858,51 +7842,41 @@ The default value is false. Default value: false
                 
         <xs:attribute name="message" type="xs:string" use="required">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the log message (uses simple language).
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="loggingLevel" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the logging level. The default value is INFO. Default value: INFO
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="logName" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the name of the logger.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="marker" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To use slf4j marker.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="logger" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To refer to a custom logger instance to lookup from the registry.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -9114,36 +8088,30 @@ To refer to a custom logger instance to lookup from the registry.
                 
         <xs:attribute name="copy" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If the copy attribute is true, a copy of the input Exchange is used for each
 iteration. That means each iteration will start from a copy of the same message.
 By default loop will loop the same exchange all over, so each iteration may have
 different message content. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="doWhile" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Enables the while loop that loops until the predicate evaluates to false or
 null. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="breakOnShutdown" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If the breakOnShutdown attribute is true, then the loop will not iterate until
 it reaches the end when Camel is shut down. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -9265,25 +8233,21 @@ it reaches the end when Camel is shut down. Default value: false
                     
           <xs:element maxOccurs="unbounded" minOccurs="0" name="configuration" type="tns:propertyDefinition">
             <xs:annotation>
-              <xs:documentation xml:lang="en">
-                <![CDATA[
+              <xs:documentation xml:lang="en"><![CDATA[
 Configurations for Apache Any23 as key-value pairs in order to customize the
 extraction process. The list of supported parameters can be found here. If not
 provided, a default configuration is used.
-              ]]>
-              </xs:documentation>
+              ]]></xs:documentation>
             </xs:annotation>
           </xs:element>
                     
           <xs:element maxOccurs="unbounded" minOccurs="0" name="extractors" type="xs:string">
             <xs:annotation>
-              <xs:documentation xml:lang="en">
-                <![CDATA[
+              <xs:documentation xml:lang="en"><![CDATA[
 List of Any23 extractors to be used in the unmarshal operation. A list of the
 available extractors can be found here here. If not provided, all the available
 extractors are used.
-              ]]>
-              </xs:documentation>
+              ]]></xs:documentation>
             </xs:annotation>
           </xs:element>
                   
@@ -9291,24 +8255,20 @@ extractors are used.
                 
         <xs:attribute name="outputFormat" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 What RDF syntax to unmarshal as, can be: NTRIPLES, TURTLE, NQUADS, RDFXML,
 JSONLD, RDFJSON, RDF4JMODEL. It is by default: RDF4JMODEL. Default value:
 RDF4JMODEL
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="baseUri" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The URI to use as base for building RDF entities if only relative paths are
 provided.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -9328,23 +8288,19 @@ provided.
                 
         <xs:attribute name="unmarshalType" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Class to use when unmarshalling.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="usingIterator" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If the asn1 file has more than one entry, the setting this option to true,
 allows working with the splitter EIP, to split the data using an iterator in a
 streaming mode. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -9364,228 +8320,188 @@ streaming mode. Default value: false
                 
         <xs:attribute name="instanceClassName" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Class name to use for marshal and unmarshalling.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="library" type="tns:avroLibrary">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Which Avro library to use. Default value: ApacheAvro
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="objectMapper" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Lookup and use the existing ObjectMapper with the given id when using Jackson.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="useDefaultObjectMapper" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether to lookup and use default Jackson ObjectMapper from the registry.
 Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="unmarshalType" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Class name of the java type to use when unmarshalling.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="jsonView" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 When marshalling a POJO to JSON you might want to exclude certain fields from
 the JSON output. With Jackson you can use JSON views to accomplish this. This
 option is to refer to the class which has JsonView annotations.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="include" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If you want to marshal a pojo to JSON, and the pojo has some fields with null
 values. And you want to skip these null values, you can set this option to
 NON_NULL.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="allowJmsType" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Used for JMS users to allow the JMSType header from the JMS spec to specify a
 FQN classname to use to unmarshal to. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="collectionType" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Refers to a custom collection type to lookup in the registry to use. This option
 should rarely be used, but allows to use different collection types than
 java.util.Collection based as default.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="useList" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To unmarshal to a List of Map or a List of Pojo. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="moduleClassNames" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To use custom Jackson modules com.fasterxml.jackson.databind.Module specified as
 a String with FQN class names. Multiple classes can be separated by comma.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="moduleRefs" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To use custom Jackson modules referred from the Camel registry. Multiple modules
 can be separated by comma.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="enableFeatures" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Set of features to enable on the Jackson
 com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that
 matches a enum from com.fasterxml.jackson.databind.SerializationFeature,
 com.fasterxml.jackson.databind.DeserializationFeature, or
 com.fasterxml.jackson.databind.MapperFeature Multiple features can be separated
 by comma.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="disableFeatures" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Set of features to disable on the Jackson
 com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that
 matches a enum from com.fasterxml.jackson.databind.SerializationFeature,
 com.fasterxml.jackson.databind.DeserializationFeature, or
 com.fasterxml.jackson.databind.MapperFeature Multiple features can be separated
 by comma.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="allowUnmarshallType" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If enabled then Jackson is allowed to attempt to use the
 CamelJacksonUnmarshalType header during the unmarshalling. This should only be
 enabled when desired to be used. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="timezone" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If set then Jackson will use the Timezone when marshalling/unmarshalling.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="autoDiscoverObjectMapper" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If set to true then Jackson will lookup for an objectMapper into the registry.
 Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="contentTypeHeader" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether the data format should set the Content-Type header with the type from
 the data format. For example application/xml for data formats marshalling to
 XML, or application/json for data formats marshalling to JSON. Default value:
 true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="schemaResolver" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Optional schema resolver used to lookup schemas for the data in transit.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="autoDiscoverSchemaResolver" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 When not disabled, the SchemaResolver will be looked up into the registry.
 Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -9605,41 +8521,33 @@ Default value: true
                 
         <xs:attribute name="barcodeFormat" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Barcode format such as QR-Code.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="imageType" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Image type of the barcode such as png.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="width" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Width of the barcode.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="height" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Height of the barcode.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -9659,34 +8567,28 @@ Height of the barcode.
                 
         <xs:attribute name="lineLength" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To specific a maximum line length for the encoded data. By default 76 is used.
 Default value: 76
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="lineSeparator" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The line separators to use. Uses new line characters (CRLF) by default.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="urlSafe" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Instead of emitting '' and '/' we emit '-' and '_' respectively. urlSafe is only
 applied to encode operations. Decoding seamlessly handles both modes. Is by
 default false. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -9706,54 +8608,44 @@ default false. Default value: false
                 
         <xs:attribute name="type" type="xs:string" use="required">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether to use Csv, Fixed, or KeyValue.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="classType" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Name of model class to use.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="allowEmptyStream" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether to allow empty streams in the unmarshal process. If true, no exception
 will be thrown when a body without records is provided. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="unwrapSingleInstance" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 When unmarshalling should a single instance be unwrapped and returned instead of
 wrapped in a java.util.List. Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="locale" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To configure a default locale to use, such as us for united states. To use the
 JVM platform default locale then use the name default.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -9773,119 +8665,99 @@ JVM platform default locale then use the name default.
                 
         <xs:attribute name="objectMapper" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Lookup and use the existing CBOR ObjectMapper with the given id when using
 Jackson.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="useDefaultObjectMapper" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether to lookup and use default Jackson CBOR ObjectMapper from the registry.
 Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="unmarshalType" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Class name of the java type to use when unmarshalling.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="collectionType" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Refers to a custom collection type to lookup in the registry to use. This option
 should rarely be used, but allows to use different collection types than
 java.util.Collection based as default.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="useList" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To unmarshal to a List of Map or a List of Pojo. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="allowUnmarshallType" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If enabled then Jackson CBOR is allowed to attempt to use the
 CamelCBORUnmarshalType header during the unmarshalling. This should only be
 enabled when desired to be used. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="prettyPrint" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To enable pretty printing output nicely formatted. Is by default false. Default
 value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="allowJmsType" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Used for JMS users to allow the JMSType header from the JMS spec to specify a
 FQN classname to use to unmarshal to. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="enableFeatures" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Set of features to enable on the Jackson
 com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that
 matches a enum from com.fasterxml.jackson.databind.SerializationFeature,
 com.fasterxml.jackson.databind.DeserializationFeature, or
 com.fasterxml.jackson.databind.MapperFeature Multiple features can be separated
 by comma.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="disableFeatures" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Set of features to disable on the Jackson
 com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that
 matches a enum from com.fasterxml.jackson.databind.SerializationFeature,
 com.fasterxml.jackson.databind.DeserializationFeature, or
 com.fasterxml.jackson.databind.MapperFeature Multiple features can be separated
 by comma.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -9905,96 +8777,78 @@ by comma.
                 
         <xs:attribute name="algorithm" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The JCE algorithm name indicating the cryptographic algorithm that will be used.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="keyRef" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Refers to the secret key to lookup from the register to use.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="cryptoProvider" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The name of the JCE Security Provider that should be used.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="initVectorRef" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Refers to a byte array containing the Initialization Vector that will be used to
 initialize the Cipher.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="algorithmParameterRef" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 A JCE AlgorithmParameterSpec used to initialize the Cipher. Will lookup the type
 using the given name as a java.security.spec.AlgorithmParameterSpec type.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="bufferSize" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The size of the buffer used in the signature process. Default value: 4096
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="macAlgorithm" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The JCE algorithm name indicating the Message Authentication algorithm. Default
 value: HmacSHA1
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="shouldAppendHMAC" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Flag indicating that a Message Authentication Code should be calculated and
 appended to the encrypted data. Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="inline" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Flag indicating that the configured IV should be inlined into the encrypted data
 stream. Is by default false. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -10014,11 +8868,9 @@ stream. Is by default false. Default value: false
                     
           <xs:element maxOccurs="unbounded" minOccurs="0" name="header" type="xs:string">
             <xs:annotation>
-              <xs:documentation xml:lang="en">
-                <![CDATA[
+              <xs:documentation xml:lang="en"><![CDATA[
 To configure the CSV headers.
-              ]]>
-              </xs:documentation>
+              ]]></xs:documentation>
             </xs:annotation>
           </xs:element>
                   
@@ -10026,293 +8878,237 @@ To configure the CSV headers.
                 
         <xs:attribute name="formatRef" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The reference format to use, it will be updated with the other format options,
 the default value is CSVFormat.DEFAULT.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="formatName" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The name of the format to use, the default value is CSVFormat.DEFAULT. Default
 value: DEFAULT
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="commentMarkerDisabled" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Disables the comment marker of the reference format. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="commentMarker" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the comment marker of the reference format.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="delimiter" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the delimiter to use. The default value is , (comma).
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="escapeDisabled" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Use for disabling using escape character. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="escape" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the escape character to use.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="headerDisabled" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Use for disabling headers. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="allowMissingColumnNames" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether to allow missing column names. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="ignoreEmptyLines" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether to ignore empty lines. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="ignoreSurroundingSpaces" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether to ignore surrounding spaces. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="nullStringDisabled" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Used to disable null strings. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="nullString" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the null string.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="quoteDisabled" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Used to disable quotes. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="quote" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the quote which by default is.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="recordSeparatorDisabled" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Used for disabling record separator.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="recordSeparator" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the record separator (aka new line) which by default is new line characters
 (CRLF).
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="skipHeaderRecord" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether to skip the header record in the output. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="quoteMode" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the quote mode.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="ignoreHeaderCase" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether or not to ignore case when accessing header names. Default value:
 false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="trim" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether or not to trim leading and trailing blanks. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="trailingDelimiter" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets whether or not to add a trailing delimiter. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="marshallerFactoryRef" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the implementation of the CsvMarshallerFactory interface which is able to
 customize marshalling/unmarshalling behavior by extending CsvMarshaller or
 creating it from scratch.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="lazyLoad" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether the unmarshalling should produce an iterator that reads the lines on the
 fly or if all the lines must be read at one. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="useMaps" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether the unmarshalling should produce maps (HashMap)for the lines values
 instead of lists. It requires to have header (either defined or collected).
 Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="useOrderedMaps" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether the unmarshalling should produce ordered maps (LinkedHashMap) for the
 lines values instead of lists. It requires to have header (either defined or
 collected). Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="recordConverterRef" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Refers to a custom CsvRecordConverter to lookup from the registry to use.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="captureHeaderRecord" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether the unmarshalling should capture the header record and store it in the
 message header. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -10332,12 +9128,10 @@ message header. Default value: false
                 
         <xs:attribute name="ref" type="xs:string" use="required">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Reference to the custom org.apache.camel.spi.DataFormat to lookup from the Camel
 registry.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -10371,130 +9165,109 @@ registry.
                 
         <xs:attribute name="fhirVersion" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The version of FHIR to use. Possible values are:
 DSTU2,DSTU2_HL7ORG,DSTU2_1,DSTU3,R4,R5. Default value: R4
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="fhirContext" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To use a custom fhir context. Reference to object of type
 ca.uhn.fhir.context.FhirContext.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="prettyPrint" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the pretty print flag, meaning that the parser will encode resources with
 human-readable spacing and newlines between elements instead of condensing
 output as much as possible. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="parserErrorHandler" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Registers an error handler which will be invoked when any parse errors are
 found. Reference to object of type ca.uhn.fhir.parser.IParserErrorHandler.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="parserOptions" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the parser options object which will be used to supply default options to
 newly created parsers. Reference to object of type
 ca.uhn.fhir.context.ParserOptions.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="preferTypes" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If set (FQN class names), when parsing resources the parser will try to use the
 given types when possible, in the order that they are provided (from highest to
 lowest priority). For example, if a custom type which declares to implement the
 Patient resource is passed in here, and the parser is parsing a Bundle
 containing a Patient resource, the parser will use the given custom type.
 Multiple class names can be separated by comma.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="forceResourceId" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 When encoding, force this resource ID to be encoded as the resource ID.
 Reference to object of type org.hl7.fhir.instance.model.api.IIdType.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="serverBaseUrl" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the server's base URL used by this parser. If a value is set, resource
 references will be turned into relative references if they are provided as
 absolute URLs but have a base matching the given base.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="omitResourceId" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If set to true (default is false) the ID of any resources being encoded will not
 be included in the output. Note that this does not apply to contained resources,
 only to root resources. In other words, if this is set to true, contained
 resources will still have local IDs but the outer/containing ID will not have an
 ID. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="encodeElementsAppliesToChildResourcesOnly" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If set to true (default is false), the values supplied to setEncodeElements(Set)
 will not be applied to the root resource (typically a Bundle), but will be
 applied to any sub-resources contained within it (i.e. search result resources
 in that bundle). Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="encodeElements" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If provided, specifies the elements which should be encoded, to the exclusion of
 all others. Multiple elements can be separated by comma when using String
 parameter. Valid values for this field would include: Patient - Encode patient
@@ -10503,15 +9276,13 @@ Patient.name.family - Encode only the patient's family name .text - Encode the
 text element on any resource (only the very first position may contain a
 wildcard) .(mandatory) - This is a special case which causes any mandatory
 fields (min 0) to be encoded.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="dontEncodeElements" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If provided, specifies the elements which should NOT be encoded. Multiple
 elements can be separated by comma when using String parameter. Valid values for
 this field would include: Patient - Don't encode patient and all its children
@@ -10521,15 +9292,13 @@ resource (only the very first position may contain a wildcard) DSTU2 note: Note
 that values including meta, such as Patient.meta will work for DSTU2 parsers,
 but values with subelements on meta such as Patient.meta.lastUpdated will only
 work in DSTU3 mode.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="stripVersionsFromReferences" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If set to true (which is the default), resource references containing a version
 will have the version removed when the resource is encoded. This is generally
 good behaviour because in most situations, references from one resource to
@@ -10538,52 +9307,44 @@ though, it may be desirable to preserve the version in resource links. In that
 case, this value should be set to false. This method provides the ability to
 globally disable reference encoding. If finer-grained control is needed, use
 setDontStripVersionsFromReferencesAtPaths(List). Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="overrideResourceIdWithBundleEntryFullUrl" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If set to true (which is the default), the Bundle.entry.fullUrl will override
 the Bundle.entry.resource's resource id if the fullUrl is defined. This behavior
 happens when parsing the source data into a Bundle object. Set this to false if
 this is not the desired behavior (e.g. the client code wishes to perform
 additional validation checks between the fullUrl and the resource id). Default
 value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="summaryMode" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If set to true (default is false) only elements marked by the FHIR specification
 as being summary elements will be included. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="suppressNarratives" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If set to true (default is false), narratives will not be included in the
 encoded values. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="dontStripVersionsFromReferencesAtPaths" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If supplied value(s), any resource references at the specified paths will have
 their resource versions encoded instead of being automatically stripped during
 the encoding process. This setting has no effect on the parsing process.
@@ -10592,21 +9353,18 @@ method provides a finer-grained level of control than
 setStripVersionsFromReferences(String) and any paths specified by this method
 will be encoded even if setStripVersionsFromReferences(String) has been set to
 true (which is the default).
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="contentTypeHeader" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether the data format should set the Content-Type header with the type from
 the data format. For example application/xml for data formats marshalling to
 XML, or application/json for data formats marshalling to JSON. Default value:
 true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -10640,85 +9398,69 @@ true
                 
         <xs:attribute name="definition" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The flatpack pzmap configuration file. Can be omitted in simpler situations, but
 its preferred to use the pzmap.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="fixed" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Delimited or fixed. Is by default false = delimited. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="delimiter" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The delimiter char (could be ; , or similar). Default value: ,
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="ignoreFirstRecord" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether the first line is ignored for delimited files (for the column headers).
 Is by default true. Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="allowShortLines" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Allows for lines to be shorter than expected and ignores the extra characters.
 Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="ignoreExtraColumns" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Allows for lines to be longer than expected and ignores the extra characters.
 Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="textQualifier" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If the text is qualified with a character. Uses quote character by default.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="parserFactoryRef" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 References to a custom parser factory to lookup in the registry.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -10738,45 +9480,37 @@ References to a custom parser factory to lookup in the registry.
                 
         <xs:attribute name="pattern" type="xs:string" use="required">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 The grok pattern to match lines of input.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="flattened" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Turns on flattened mode. In flattened mode the exception is thrown when there
 are multiple pattern matches with same key. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="allowMultipleMatchesPerLine" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If false, every line of input is matched for pattern only once. Otherwise the
 line can be scanned multiple times when non-terminal pattern is used. Default
 value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="namedOnly" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether to capture named expressions only or not (i.e. %{IP:ip} but not ${IP}).
 Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -10810,11 +9544,9 @@ Default value: false
                 
         <xs:attribute name="validate" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether to validate the HL7 message Is by default true. Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -10834,11 +9566,9 @@ Whether to validate the HL7 message Is by default true. Default value: true
                 
         <xs:attribute name="validating" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether to validate. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -10858,187 +9588,155 @@ Whether to validate. Default value: false
                 
         <xs:attribute name="xmlMapper" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Lookup and use the existing XmlMapper with the given id.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="prettyPrint" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To enable pretty printing output nicely formatted. Is by default false. Default
 value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="unmarshalType" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Class name of the java type to use when unmarshalling.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="allowUnmarshallType" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If enabled then Jackson is allowed to attempt to use the
 CamelJacksonUnmarshalType header during the unmarshalling. This should only be
 enabled when desired to be used. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="jsonView" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 When marshalling a POJO to JSON you might want to exclude certain fields from
 the JSON output. With Jackson you can use JSON views to accomplish this. This
 option is to refer to the class which has JsonView annotations.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="include" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If you want to marshal a pojo to JSON, and the pojo has some fields with null
 values. And you want to skip these null values, you can set this option to
 NON_NULL.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="allowJmsType" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Used for JMS users to allow the JMSType header from the JMS spec to specify a
 FQN classname to use to unmarshal to. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="collectionType" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Refers to a custom collection type to lookup in the registry to use. This option
 should rarely be used, but allows to use different collection types than
 java.util.Collection based as default.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="useList" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To unmarshal to a List of Map or a List of Pojo. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="timezone" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If set then Jackson will use the Timezone when marshalling/unmarshalling.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="enableJaxbAnnotationModule" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether to enable the JAXB annotations module when using jackson. When enabled
 then JAXB annotations can be used by Jackson. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="moduleClassNames" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To use custom Jackson modules com.fasterxml.jackson.databind.Module specified as
 a String with FQN class names. Multiple classes can be separated by comma.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="moduleRefs" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To use custom Jackson modules referred from the Camel registry. Multiple modules
 can be separated by comma.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="enableFeatures" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Set of features to enable on the Jackson
 com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that
 matches a enum from com.fasterxml.jackson.databind.SerializationFeature,
 com.fasterxml.jackson.databind.DeserializationFeature, or
 com.fasterxml.jackson.databind.MapperFeature Multiple features can be separated
 by comma.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="disableFeatures" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Set of features to disable on the Jackson
 com.fasterxml.jackson.databind.ObjectMapper. The features should be a name that
 matches a enum from com.fasterxml.jackson.databind.SerializationFeature,
 com.fasterxml.jackson.databind.DeserializationFeature, or
 com.fasterxml.jackson.databind.MapperFeature Multiple features can be separated
 by comma.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="contentTypeHeader" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether the data format should set the Content-Type header with the type from
 the data format. For example application/xml for data formats marshalling to
 XML, or application/json for data formats marshalling to JSON. Default value:
 true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -11058,122 +9756,101 @@ true
                 
         <xs:attribute name="contextPath" type="xs:string" use="required">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Package name where your JAXB classes are located.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="contextPathIsClassName" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 This can be set to true to mark that the contextPath is referring to a classname
 and not a package name. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="schema" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To validate against an existing schema. Your can use the prefix classpath:,
 file: or http: to specify how the resource should be resolved. You can separate
 multiple schema files by using the ',' character.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="schemaSeverityLevel" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Sets the schema severity level to use when validating against a schema. This
 level determines the minimum severity error that triggers JAXB to stop continue
 parsing. The default value of 0 (warning) means that any error (warning, error
 or fatal error) will trigger JAXB to stop. There are the following three levels:
 0=warning, 1=error, 2=fatal error. Default value: 0
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="prettyPrint" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To enable pretty printing output nicely formatted. Is by default false. Default
 value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="objectFactory" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether to allow using ObjectFactory classes to create the POJO classes during
 marshalling. This only applies to POJO classes that has not been annotated with
 JAXB and providing jaxb.index descriptor files. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="ignoreJAXBElement" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether to ignore JAXBElement elements - only needed to be set to false in very
 special use-cases. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="mustBeJAXBElement" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether marhsalling must be java objects with JAXB annotations. And if not then
 it fails. This option can be set to false to relax that, such as when the data
 is already in XML format. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="filterNonXmlChars" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To ignore non xml characheters and replace them with an empty space. Default
 value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="encoding" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To overrule and use a specific encoding.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="fragment" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To turn on marshalling XML fragment trees. By default JAXB looks for
 XmlRootElement annotation on given class to operate on whole XML tree. This is
 useful but not always - sometimes generated code does not have XmlRootElement
@@ -11181,111 +9858,92 @@ annotation, sometimes you need unmarshall only part of tree. In that case you
 can use partial unmarshalling. To enable this behaviours you need set property
 partClass. Camel will pass this class to JAXB's unmarshaler. Default value:
 false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="partClass" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Name of class used for fragment parsing. See more details at the fragment
 option.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="partNamespace" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 XML namespace to use for fragment parsing. See more details at the fragment
 option.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="namespacePrefixRef" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 When marshalling using JAXB or SOAP then the JAXB implementation will automatic
 assign namespace prefixes, such as ns2, ns3, ns4 etc. To control this mapping,
 Camel allows you to refer to a map which contains the desired mapping.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="xmlStreamWriterWrapper" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To use a custom xml stream writer.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="schemaLocation" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To define the location of the schema.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="noNamespaceSchemaLocation" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To define the location of the namespaceless schema.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="jaxbProviderProperties" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Refers to a custom java.util.Map to lookup in the registry containing custom
 JAXB provider properties to be used with the JAXB marshaller.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="contentTypeHeader" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether the data format should set the Content-Type header with the type from
 the data format. For example application/xml for data formats marshalling to
 XML, or application/json for data formats marshalling to JSON. Default value:
 true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="accessExternalSchemaProtocols" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Only in use if schema validation has been enabled. Restrict access to the
 protocols specified for external reference set by the schemaLocation attribute,
 Import and Include element. Examples of protocols are file, http, jar:file.
 false or none to deny all access to external references; a specific protocol,
 such as file, to give permission to only the protocol; the keyword all to grant
 permission to all protocols. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
               
@@ -11305,180 +9963,149 @@ permission to all protocols. Default value: false
                 
         <xs:attribute name="objectMapper" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Lookup and use the existing ObjectMapper with the given id when using Jackson.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="useDefaultObjectMapper" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Whether to lookup and use default Jackson ObjectMapper from the registry.
 Default value: true
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="autoDiscoverObjectMapper" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If set to true then Jackson will look for an objectMapper to use from the
 registry. Default value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="prettyPrint" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 To enable pretty printing output nicely formatted. Is by default false. Default
 value: false
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="library" type="tns:jsonLibrary">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Which json library to use. Default value: Jackson
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="unmarshalType" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 Class name of the java type to use when unmarshalling.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="jsonView" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 When marshalling a POJO to JSON you might want to exclude certain fields from
 the JSON output. With Jackson you can use JSON views to accomplish this. This
 option is to refer to the class which has JsonView annotations.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
         <xs:attribute name="include" type="xs:string">
           <xs:annotation>
-            <xs:documentation xml:lang="en">
-              <![CDATA[
+            <xs:documentation xml:lang="en"><![CDATA[
 If you want to marshal a pojo to JSON, and the pojo has some fields with null
 values. And you want to skip these null values, you can set this option to
 NON_NULL.
-            ]]>
-            </xs:documentation>
+            ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
                 
... 26571 lines suppressed ...


[camel] 02/08: 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 82e5b8ca3f9ba7e38483efc810e08dd76f4e0b75
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");


[camel] 06/08: Migration to Jetty 11

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

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

commit ecf5b3893841f67b3615046610712e87ae7de4f6
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)
    (cherry picked from commit 4dd107e0f8f0946105506aa43d187e70fefb3f9c)
---
 .../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}           |  8 +--
 .../JettyHttpEndpoint11Configurer.java}            |  8 +--
 .../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(+), 111 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 fe16707e5ec..f5415ecf08f 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 e69cff266a4..fbe6107045f 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=3.21.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 05ce7ab2cd6..15b1af067bd 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 529b1cdd1ad..99694863d47 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>.
@@ -178,27 +180,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);
@@ -231,7 +225,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();
@@ -248,9 +242,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()) {
@@ -267,8 +258,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);
@@ -308,6 +299,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 97%
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..cf2f084c338 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,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.util.Map;
 
@@ -15,11 +15,11 @@ 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 +164,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 97%
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..5554f25e0e9 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,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.util.Map;
 
@@ -15,11 +15,11 @@ 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 +154,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 fe16707e5ec..61b553c0e95 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 3e95ffbb875..b70b57caec4 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 9235d25b454..d2b5251c8e3 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 7afa6dfdb32..569e8777136 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 10832bf251a..ac278724233 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/08: Rewrite script

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

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

commit 76ea1ee2fe3568540e354c381c701b4d9bffa0ba
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] 05/08: 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 38f632e9045b901f9e0dba5f432d65b017ae5551
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jan 2 12:04:25 2023 +0100

    Switch to jakarta namespace
---
 .../src/main/resources/archetype-resources/pom.xml |   8 +-
 .../src/main/java/MyRoutes.java                    |   2 +-
 .../src/main/java/SomeBean.java                    |   4 +-
 bom/camel-bom/pom.xml                              |  30 ---
 bom/pom.xml                                        |   1 -
 .../src/main/resources/camel-checkstyle.xml        |   2 +-
 camel-dependencies/pom.xml                         |  94 ++++-----
 catalog/camel-allcomponents/pom.xml                |  30 ---
 catalog/camel-catalog-console/pom.xml              |   4 -
 catalog/camel-catalog-lucene/pom.xml               |   4 -
 catalog/camel-catalog/pom.xml                      |   6 -
 .../apache/camel/catalog/components/activemq.json  |  38 ++--
 .../org/apache/camel/catalog/components/amqp.json  |  38 ++--
 .../catalog/components/atmosphere-websocket.json   |   2 +-
 .../camel/catalog/components/bean-validator.json   |  22 +--
 .../org/apache/camel/catalog/components/imap.json  |  14 +-
 .../org/apache/camel/catalog/components/imaps.json |  14 +-
 .../org/apache/camel/catalog/components/jetty.json |   6 +-
 .../org/apache/camel/catalog/components/jms.json   |  38 ++--
 .../org/apache/camel/catalog/components/jpa.json   |   6 +-
 .../org/apache/camel/catalog/components/pop3.json  |  14 +-
 .../org/apache/camel/catalog/components/pop3s.json |  14 +-
 .../apache/camel/catalog/components/resteasy.json  |   2 +-
 .../apache/camel/catalog/components/servlet.json   |   2 +-
 .../org/apache/camel/catalog/components/sjms.json  |  18 +-
 .../org/apache/camel/catalog/components/sjms2.json |  18 +-
 .../org/apache/camel/catalog/components/smtp.json  |  14 +-
 .../org/apache/camel/catalog/components/smtps.json |  14 +-
 .../camel/catalog/components/websocket-jsr356.json |   2 +-
 catalog/camel-route-parser/pom.xml                 |  14 --
 .../camel/parser/java/MyCdiConcatRouteBuilder.java |   2 +-
 .../camel/parser/java/MyCdiRouteBuilder.java       |   2 +-
 catalog/pom.xml                                    |  18 --
 components/camel-activemq/pom.xml                  |   6 +-
 .../converter/ActiveMQMessageConverterLoader.java  |   4 +-
 .../apache/camel/component/activemq/activemq.json  |  38 ++--
 .../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                      |  16 +-
 .../org/apache/camel/component/amqp/amqp.json      |  38 ++--
 .../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-asn1/pom.xml                      |   6 +-
 components/camel-asterisk/pom.xml                  |   3 -
 components/camel-atmosphere-websocket/pom.xml      |  21 +-
 .../atmosphere/websocket/atmosphere-websocket.json |   2 +-
 .../websocket/CamelWebSocketServlet.java           |   8 +-
 .../atmosphere/websocket/WebsocketConsumer.java    |   8 +-
 components/camel-atom/pom.xml                      |   3 -
 .../apache/camel/component/atom/MyHttpServlet.java |   6 +-
 components/camel-attachments/pom.xml               |   7 +-
 .../attachment/AttachmentConverterLoader.java      |   2 +-
 .../org/apache/camel/attachment/Attachment.java    |   2 +-
 .../camel/attachment/AttachmentConverter.java      |   2 +-
 .../apache/camel/attachment/AttachmentMessage.java |   4 +-
 .../camel/attachment/CamelFileDataSource.java      |   4 +-
 .../apache/camel/attachment/DefaultAttachment.java |   4 +-
 .../camel/attachment/DefaultAttachmentMessage.java |   2 +-
 .../attachment/BeanMethodWithExchangeTest.java     |   4 +-
 .../camel/attachment/BodyAndHeaderConvertTest.java |   4 +-
 .../MessageWithAttachmentRedeliveryIssueTest.java  |   4 +-
 .../org/apache/camel/attachment/WireTapTest.java   |   4 +-
 .../camel/component/aws2/ses/Ses2Producer.java     |   4 +-
 .../camel/component/aws2/ses/MockMessage.java      |  12 +-
 .../camel-azure/camel-azure-cosmosdb/pom.xml       |   6 -
 .../camel-azure/camel-azure-eventhubs/pom.xml      |   6 -
 .../camel-azure/camel-azure-servicebus/pom.xml     |   6 -
 .../BeanValidatorComponentConfigurer.java          |  20 +-
 .../validator/BeanValidatorEndpointConfigurer.java |  20 +-
 .../component/bean/validator/bean-validator.json   |  22 +--
 .../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-bonita/pom.xml                    |   7 +-
 .../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         |   3 -
 components/camel-braintree/pom.xml                 |   1 -
 components/camel-caffeine-lrucache/pom.xml         |  29 ---
 components/camel-cdi-jta/pom.xml                   |   6 +-
 .../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                  |   6 +-
 .../src/main/java/org/apache/camel/cdi/Main.java   |  14 +-
 components/camel-cdi/pom.xml                       |  20 +-
 .../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 +-
 .../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                      |   3 -
 components/camel-cometd/pom.xml                    |  18 +-
 .../camel/component/cometd/CometdComponent.java    |   2 +-
 .../camel/component/cometd/CometdProducer.java     |   2 +-
 ...ConsumerInteractiveAuthenticatedManualTest.java |   4 +-
 ...ucerConsumerInteractiveExtensionManualTest.java |   4 +-
 .../cloud/ConsulServiceCallWithRegistrationIT.java |   6 +-
 .../consul/cloud/ConsulServiceDiscoveryIT.java     |   4 +-
 .../cloud/ConsulServiceRegistrationTestBase.java   |   4 +-
 components/camel-cxf/camel-cxf-common/pom.xml      |  43 +----
 .../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        |  41 +---
 .../component/cxf/jaxrs/CxfConverterLoader.java    |  12 +-
 .../camel/component/cxf/jaxrs/CxfConverter.java    |   6 +-
 .../camel/component/cxf/jaxrs/CxfRsBinding.java    |  10 +-
 .../camel/component/cxf/jaxrs/CxfRsInvoker.java    |  10 +-
 .../camel/component/cxf/jaxrs/CxfRsProducer.java   |  14 +-
 .../component/cxf/jaxrs/DataFormatProvider.java    |  14 +-
 .../component/cxf/jaxrs/DefaultCxfRsBinding.java   |  12 +-
 .../component/cxf/jaxrs/DefaultModelResource.java  |   4 +-
 .../component/cxf/jaxrs/SimpleCxfRsBinding.java    |  24 +--
 .../component/cxf/jaxrs/CustomExceptionMapper.java |   4 +-
 .../CxfRsBindingConfigurationSelectionTest.java    |   4 +-
 .../cxf/jaxrs/CxfRsConvertBodyToTest.java          |   2 +-
 .../jaxrs/CxfRsProducerEndpointConfigurerTest.java |   2 +-
 .../jaxrs/CxfRsProducerHttpMethodHeaderTest.java   |   2 +-
 .../cxf/jaxrs/DataFormatProviderTest.java          |   2 +-
 .../CxfRsConsumerSimpleBindingImplTest.java        |   2 +-
 .../CxfRsConsumerSimpleBindingTest.java            |   4 +-
 .../cxf/jaxrs/simplebinding/testbean/Customer.java |   2 +-
 .../jaxrs/simplebinding/testbean/CustomerList.java |   2 +-
 .../simplebinding/testbean/CustomerService.java    |  18 +-
 .../testbean/CustomerServiceImpl.java              |   4 +-
 .../testbean/CustomerServiceResource.java          |  18 +-
 .../simplebinding/testbean/MultipartCustomer.java  |  12 +-
 .../cxf/jaxrs/simplebinding/testbean/Order.java    |   8 +-
 .../cxf/jaxrs/simplebinding/testbean/Product.java  |   2 +-
 .../testbean/VipCustomerResource.java              |  14 +-
 .../component/cxf/jaxrs/testbean/Customer.java     |   2 +-
 .../cxf/jaxrs/testbean/CustomerService.java        |  18 +-
 .../jaxrs/testbean/CustomerServiceResource.java    |  14 +-
 .../component/cxf/jaxrs/testbean/EchoService.java  |  14 +-
 .../camel/component/cxf/jaxrs/testbean/Order.java  |   8 +-
 .../component/cxf/jaxrs/testbean/Product.java      |   2 +-
 components/camel-cxf/camel-cxf-soap/pom.xml        |  43 +----
 .../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      |  38 +---
 components/camel-cxf/camel-cxf-spring-rest/pom.xml |  36 ----
 .../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 |  37 +---
 .../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   |  23 +--
 .../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   |  26 +--
 .../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 +-
 .../camel-debezium-maven-plugin/pom.xml            |  17 --
 components/camel-dozer/pom.xml                     |   4 +-
 .../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-elytron/pom.xml                   |   4 +-
 components/camel-fhir/camel-fhir-component/pom.xml |   4 -
 components/camel-flatpack/pom.xml                  |   3 -
 components/camel-freemarker/pom.xml                |   3 -
 .../freemarker/FreemarkerAttachmentsTest.java      |   4 +-
 components/camel-ftp/pom.xml                       |   3 -
 .../camel-google/camel-google-calendar/pom.xml     |   1 -
 components/camel-google/camel-google-drive/pom.xml |   1 -
 components/camel-google/camel-google-mail/pom.xml  |   1 -
 .../google/mail/GmailUsersMessagesIT.java          |   8 +-
 .../component/google/mail/GmailUsersThreadsIT.java |   8 +-
 .../camel-google/camel-google-pubsub/pom.xml       |   1 -
 .../camel-google/camel-google-sheets/pom.xml       |   1 -
 components/camel-gora/pom.xml                      |   4 -
 components/camel-groovy/pom.xml                    |  11 --
 components/camel-grpc/pom.xml                      |   4 +-
 components/camel-hazelcast/pom.xml                 |   3 -
 components/camel-hdfs/pom.xml                      |  14 --
 components/camel-hl7/pom.xml                       |   3 -
 components/camel-http-common/pom.xml               |  10 +-
 .../camel/http/common/HttpConverterLoader.java     |  10 +-
 .../org/apache/camel/http/common/CamelServlet.java |  14 +-
 .../camel/http/common/DefaultHttpBinding.java      |   8 +-
 .../camel/http/common/DefaultHttpRegistry.java     |   2 +-
 .../org/apache/camel/http/common/HttpBinding.java  |   8 +-
 .../camel/http/common/HttpCommonEndpoint.java      |   4 +-
 .../apache/camel/http/common/HttpConverter.java    |   6 +-
 .../org/apache/camel/http/common/HttpHelper.java   |   4 +-
 .../org/apache/camel/http/common/HttpMessage.java  |   4 +-
 .../HttpRestServletResolveConsumerStrategy.java    |   2 +-
 .../common/HttpServletResolveConsumerStrategy.java |   2 +-
 .../common/ServletResolveConsumerStrategy.java     |   8 +-
 components/camel-http/pom.xml                      |   9 +-
 .../http/handler/SessionReflectionHandler.java     |   8 +-
 components/camel-ical/pom.xml                      |   5 -
 components/camel-jackson-avro/pom.xml              |   3 -
 components/camel-jackson-protobuf/pom.xml          |   3 -
 components/camel-jackson/pom.xml                   |   3 -
 .../camel/component/jackson/TestJAXBPojo.java      |   4 +-
 .../camel/component/jackson/converter/Order.java   |   8 +-
 components/camel-jacksonxml/pom.xml                |   3 -
 .../camel/component/jacksonxml/TestJAXBPojo.java   |   4 +-
 components/camel-jasypt/pom.xml                    |  10 -
 components/camel-jaxb/pom.xml                      |   5 -
 .../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                      |   4 +-
 components/camel-jclouds/pom.xml                   |   3 -
 .../component/jclouds/JcloudsBlobStoreHelper.java  |   5 +-
 components/camel-jetty-common/pom.xml              |  12 +-
 .../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                     |  23 +--
 .../jetty9/JettyHttpEndpoint9Configurer.java       |   6 +-
 .../org/apache/camel/component/jetty9/jetty.json   |   6 +-
 .../component/jetty9/AttachmentHttpBinding.java    |   8 +-
 .../camel/component/jetty/CustomFiltersTest.java   |  14 +-
 .../jetty/ExplicitJettyAsyncRouteTest.java         |   2 +-
 .../component/jetty/ExplicitJettyRouteTest.java    |   2 +-
 .../jetty/HttpAuthMethodPriorityTest.java          |   2 +-
 .../HttpBasicAuthComponentConfiguredTest.java      |   2 +-
 .../camel/component/jetty/HttpBasicAuthTest.java   |   2 +-
 .../camel/component/jetty/HttpBindingRefTest.java  |   2 +-
 .../camel/component/jetty/HttpConverterTest.java   |   6 +-
 .../component/jetty/HttpGZipEncodingTest.java      |   2 +-
 .../camel/component/jetty/HttpHeaderTest.java      |   2 +-
 .../component/jetty/HttpRequestResponseTest.java   |   4 +-
 .../camel/component/jetty/HttpRouteTest.java       |   2 +-
 .../camel/component/jetty/JettyRouteTest.java      |   2 +-
 .../jetty/JettyRouteWithSocketPropertiesTest.java  |   2 +-
 .../camel/component/jetty/MultiPartFormTest.java   |   2 +-
 .../jetty/MultiPartFormWithCustomFilterTest.java   |  12 +-
 .../camel/component/jetty/MyErrorHandler.java      |   2 +-
 .../component/jetty/SpringHttpsRouteTest.java      |   2 +-
 .../component/jetty/rest/MyCustomHttpBinding.java  |   2 +-
 .../camel/component/jetty/rest/MyLoginService.java |   2 +-
 .../camel/component/jetty/rest/UserJaxbPojo.java   |   8 +-
 components/camel-jms/pom.xml                       |  47 +----
 .../component/jms/JmsComponentConfigurer.java      |   8 +-
 .../camel/component/jms/JmsEndpointConfigurer.java |   8 +-
 .../org/apache/camel/component/jms/jms.json        |  38 ++--
 .../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                       |   4 -
 .../component/jmx/NotificationXmlFormatter.java    |   6 +-
 .../camel-jmx/src/main/resources/notifications.xsd |   4 +-
 components/camel-johnzon/pom.xml                   |   6 +-
 components/camel-jooq/pom.xml                      |   6 +-
 components/camel-jpa/pom.xml                       |  13 +-
 .../component/jpa/JpaComponentConfigurer.java      |   4 +-
 .../camel/component/jpa/JpaEndpointConfigurer.java |   4 +-
 .../org/apache/camel/component/jpa/jpa.json        |   6 +-
 .../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-jsch/pom.xml                      |   3 -
 components/camel-jsonb/pom.xml                     |  12 +-
 .../component/jsonb/JsonbDataFormatConfigurer.java |   2 +-
 .../camel/component/jsonb/JsonbDataFormat.java     |  12 +-
 .../component/jsonb/JsonbAttributeOrderTest.java   |   2 +-
 components/camel-jsonpath/pom.xml                  |   5 -
 components/camel-jta/pom.xml                       |   4 +-
 .../apache/camel/jta/TransactionErrorHandler.java  |   2 +-
 components/camel-kubernetes/pom.xml                |   4 -
 components/camel-leveldb/pom.xml                   |   8 -
 components/camel-lucene/pom.xml                    |   3 -
 ...osoftExchangeOnlineOAuth2MailAuthenticator.java |   2 +-
 components/camel-mail/pom.xml                      |  14 +-
 .../component/mail/MailComponentConfigurer.java    |   4 +-
 .../camel/component/mail/MailConvertersLoader.java |  16 +-
 .../component/mail/MailEndpointConfigurer.java     |   8 +-
 .../org/apache/camel/component/mail/imap.json      |  14 +-
 .../org/apache/camel/component/mail/imaps.json     |  14 +-
 .../org/apache/camel/component/mail/pop3.json      |  14 +-
 .../org/apache/camel/component/mail/pop3s.json     |  14 +-
 .../org/apache/camel/component/mail/smtp.json      |  14 +-
 .../org/apache/camel/component/mail/smtps.json     |  14 +-
 ...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 +-
 .../camel-microprofile-health/pom.xml              |   6 +-
 ...CamelMicroProfileHealthCheckRepositoryTest.java |   4 +-
 .../health/CamelMicroProfileHealthCheckTest.java   |   4 +-
 .../CamelMicroProfileHealthComponentsTest.java     |   4 +-
 .../CamelMicroProfileHealthConsumerTest.java       |   4 +-
 ...CamelMicroProfileHealthRegistryBindingTest.java |   4 +-
 ...MicroProfileHealthSupervisedRoutesMainTest.java |   6 +-
 .../health/CamelMicroProfileHealthTestHelper.java  |   8 +-
 .../health/CamelMicroProfileHealthTestSupport.java |   4 +-
 .../camel-microprofile-metrics/pom.xml             |  12 +-
 components/camel-milo/pom.xml                      |   4 -
 .../milo/client/MiloClientConfiguration.java       |   2 +-
 components/camel-mina/pom.xml                      |   1 -
 components/camel-mllp/pom.xml                      |   3 +-
 components/camel-mybatis/pom.xml                   |   3 -
 components/camel-netty-http/pom.xml                |   4 +-
 .../netty/http/NettyHttpProducerSessionTest.java   |   2 +-
 .../netty/http/SpringNettyHttpBasicAuthTest.java   |   2 +-
 .../netty/http/SpringNettyHttpSSLTest.java         |   2 +-
 .../component/netty/http/rest/UserJaxbPojo.java    |   8 +-
 components/camel-olingo2/camel-olingo2-api/pom.xml |   3 -
 .../camel-olingo2/camel-olingo2-component/pom.xml  |   1 -
 .../olingo2/Olingo2AppAPIETagEnabledTest.java      |   2 +-
 .../src/test/resources/olingo2_ref/WEB-INF/web.xml |   6 +-
 components/camel-olingo4/camel-olingo4-api/pom.xml |   3 -
 .../camel-olingo4/camel-olingo4-component/pom.xml  |   1 -
 components/camel-openapi-java/pom.xml              |  12 +-
 components/camel-paho/pom.xml                      |   6 +-
 .../http/vertx/VertxPlatformHttpConsumer.java      |   2 +-
 .../http/vertx/VertxPlatformHttpEngineTest.java    |   2 +-
 .../http/PlatformHttpHeaderFilterStrategy.java     |   2 +-
 .../http/JettyCustomPlatformHttpConsumer.java      |   4 +-
 components/camel-plc4x/pom.xml                     |   6 +-
 components/camel-protobuf/pom.xml                  |   3 -
 components/camel-quickfix/pom.xml                  |   4 -
 components/camel-rest-openapi/pom.xml              |   4 -
 .../camel/component/rest/openapi/HttpsTest.java    |   4 +-
 .../camel/component/rest/openapi/HttpsV3Test.java  |   4 +-
 .../apache/camel/component/rest/openapi/Pet.java   |   2 +-
 .../apache/camel/component/rest/openapi/Pets.java  |   8 +-
 .../rest/openapi/RestOpenApiComponentTest.java     |   4 +-
 .../rest/openapi/RestOpenApiComponentV3Test.java   |   4 +-
 .../openapi/RestOpenApiComponentV3YamlTest.java    |   4 +-
 .../rest/openapi/RestOpenApiComponentYamlTest.java |   4 +-
 .../camel/component/rest/swagger/HttpsTest.java    |   4 +-
 .../apache/camel/component/rest/swagger/Pet.java   |   2 +-
 .../apache/camel/component/rest/swagger/Pets.java  |   8 +-
 .../rest/swagger/RestSwaggerComponentTest.java     |   4 +-
 components/camel-resteasy/pom.xml                  |  12 +-
 .../apache/camel/component/resteasy/resteasy.json  |   2 +-
 .../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 +-
 .../apache/camel/component/rss/MyHttpServlet.java  |   6 +-
 .../camel-salesforce-codegen/pom.xml               |  17 --
 .../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             |  30 ++-
 .../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          |  23 +--
 .../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-saxon/pom.xml                     |   3 -
 .../camel-servicenow-component/pom.xml             |   7 +-
 .../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          |  17 --
 .../camel/maven/CamelServiceNowGenerateMojo.java   |   2 +-
 components/camel-servlet/pom.xml                   |  10 +-
 .../apache/camel/component/servlet/servlet.json    |   2 +-
 .../component/servlet/AttachmentHttpBinding.java   |   6 +-
 .../servlet/CamelHttpTransportServlet.java         |   4 +-
 .../component/servlet/ServletRestHttpBinding.java  |   2 +-
 .../component/servlet/HttpClientRouteTest.java     |   4 +-
 .../camel/component/servlet/rest/UserJaxbPojo.java |   8 +-
 components/camel-sjms/pom.xml                      |  23 +--
 .../component/sjms/SjmsComponentConfigurer.java    |   8 +-
 .../component/sjms/SjmsEndpointConfigurer.java     |   8 +-
 .../org/apache/camel/component/sjms/sjms.json      |  18 +-
 .../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                     |  30 +--
 .../org/apache/camel/component/sjms2/sjms2.json    |  18 +-
 .../component/sjms2/jms/Jms2ObjectFactory.java     |  14 +-
 .../sjms2/producer/InOnlyQueueProducerTest.java    |   6 +-
 .../sjms2/producer/InOnlyTopicProducerTest.java    |   6 +-
 .../component/sjms2/support/Jms2TestSupport.java   |   8 +-
 components/camel-soap/pom.xml                      |  15 +-
 .../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                      |   6 -
 .../apache/camel/component/solr/SolrProducer.java  |   2 +-
 components/camel-splunk/pom.xml                    |   3 -
 components/camel-spring-batch/pom.xml              |   2 -
 components/camel-spring-integration/pom.xml        |   4 -
 components/camel-spring-ldap/pom.xml               |   4 -
 components/camel-spring-redis/pom.xml              |   4 +-
 .../RedisStringIdempotentRepositoryManualIT.java   |   2 +-
 components/camel-spring-security/pom.xml           |   2 -
 components/camel-spring-ws/pom.xml                 |  22 +--
 .../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                |  18 +-
 .../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 +-
 .../java/org/apache/camel/spring/package-info.java |   4 +-
 components/camel-stax/pom.xml                      |   4 -
 .../component/stax/StAXJAXBIteratorExpression.java |   6 +-
 .../org/apache/camel/component/stax/StAXUtil.java  |   4 +-
 .../apache/camel/component/stax/model/Order.java   |   8 +-
 .../apache/camel/component/stax/model/Orders.java  |   8 +-
 .../apache/camel/component/stax/model/Product.java |   6 +-
 .../apache/camel/component/stax/model/Record.java  |   8 +-
 .../apache/camel/component/stax/model/Records.java |   8 +-
 .../camel/component/stax/model/RecordsUtil.java    |   6 +-
 components/camel-swagger-java/pom.xml              |   7 +-
 components/camel-syslog/pom.xml                    |   4 -
 .../camel/component/syslog/SyslogConverter.java    |   2 +-
 .../camel-test/camel-test-cdi-junit5/pom.xml       |   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       |   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 +-
 .../camel-test/camel-test-spring-junit5/pom.xml    |   2 +-
 components/camel-test/camel-test-spring/pom.xml    |   2 +-
 components/camel-test/pom.xml                      |   4 +-
 .../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-twilio/pom.xml                    |   1 -
 .../security/SpringSecurityConfiguration.java      |   2 +-
 .../spring/security/SpringSecurityProvider.java    |   8 +-
 .../AbstractSpringSecurityBearerTokenTest.java     |   2 +-
 .../component/spring/security/MockFilter.java      |  12 +-
 components/camel-undertow/pom.xml                  |  11 +-
 .../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 +-
 .../camel-vertx-kafka-maven-plugin/pom.xml         |  17 --
 components/camel-websocket-jsr356/pom.xml          |  14 +-
 .../camel/websocket/jsr356/websocket-jsr356.json   |   2 +-
 .../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                 |  17 +-
 .../component/websocket/WebsocketComponent.java    |   2 +-
 components/camel-wordpress/pom.xml                 |   7 +-
 .../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-xslt-saxon/pom.xml                |   3 -
 components/camel-xstream/pom.xml                   |   3 -
 components/camel-zookeeper-master/pom.xml          |   5 -
 components/pom.xml                                 |  66 +------
 core/camel-api/pom.xml                             |   8 +-
 .../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 +-
 .../dsl/DynamicRouterComponentBuilderFactory.java  |   2 +-
 core/camel-core-engine/pom.xml                     |  28 +--
 core/camel-core-model/pom.xml                      |  14 --
 .../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/ValueDefinition.java    |   8 +-
 .../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 +-
 .../JtaTransactionErrorHandlerDefinition.java      |   6 +-
 .../errorhandler/NoErrorHandlerConfiguration.java  |   2 +-
 .../errorhandler/NoErrorHandlerDefinition.java     |   6 +-
 .../errorhandler/RefErrorHandlerDefinition.java    |   8 +-
 .../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                  |  14 --
 core/camel-core-reifier/pom.xml                    |  14 --
 core/camel-core-xml/pom.xml                        |   4 -
 .../AbstractCamelConsumerTemplateFactoryBean.java  |   8 +-
 .../core/xml/AbstractCamelContextFactoryBean.java  |   6 +-
 .../core/xml/AbstractCamelEndpointFactoryBean.java |  10 +-
 .../camel/core/xml/AbstractCamelFactoryBean.java   |   8 +-
 ...ractCamelFluentProducerTemplateFactoryBean.java |   8 +-
 .../AbstractCamelProducerTemplateFactoryBean.java  |   8 +-
 .../AbstractCamelRedeliveryPolicyFactoryBean.java  |   6 +-
 .../xml/AbstractCamelThreadPoolFactoryBean.java    |   6 +-
 .../camel/core/xml/CamelJMXAgentDefinition.java    |   8 +-
 .../xml/CamelPropertyPlaceholderDefinition.java    |  10 +-
 ...CamelPropertyPlaceholderFunctionDefinition.java |   4 +-
 ...CamelPropertyPlaceholderLocationDefinition.java |   4 +-
 .../core/xml/CamelRouteControllerDefinition.java   |   8 +-
 .../xml/CamelStreamCachingStrategyDefinition.java  |   8 +-
 .../org/apache/camel/core/xml/package-info.java    |   4 +-
 ...bstractBaseSSLContextParametersFactoryBean.java |   4 +-
 .../AbstractKeyManagersParametersFactoryBean.java  |   8 +-
 .../AbstractKeyStoreParametersFactoryBean.java     |   8 +-
 ...tractSSLContextClientParametersFactoryBean.java |   8 +-
 .../AbstractSSLContextParametersFactoryBean.java   |   8 +-
 ...tractSSLContextServerParametersFactoryBean.java |   8 +-
 .../AbstractSecureRandomParametersFactoryBean.java |   8 +-
 ...AbstractTrustManagersParametersFactoryBean.java |   8 +-
 .../jsse/CipherSuitesParametersDefinition.java     |   6 +-
 .../xml/util/jsse/FilterParametersDefinition.java  |   6 +-
 .../core/xml/util/jsse/SNIHostNamesDefinition.java |   8 +-
 .../SecureSocketProtocolsParametersDefinition.java |   6 +-
 .../camel/core/xml/util/jsse/package-info.java     |   4 +-
 core/camel-core/pom.xml                            |  25 +--
 .../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-xml-jaxb/pom.xml                        |  15 +-
 .../xml/jaxb/DefaultModelJAXBContextFactory.java   |   4 +-
 .../java/org/apache/camel/xml/jaxb/JaxbHelper.java |   8 +-
 .../camel/xml/jaxb/JaxbModelToXMLDumper.java       |   4 +-
 core/pom.xml                                       |  51 -----
 .../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 +-
 dsl/camel-endpointdsl/pom.xml                      |   4 -
 .../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 +-
 .../apache/camel/dsl/java/joor/MultiCompile.java   |   4 +-
 dsl/camel-jbang/camel-jbang-core/pom.xml           |   6 +-
 dsl/camel-kamelet-main/pom.xml                     |   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-xml-jaxb-dsl-test/cdi/pom.xml            |   8 +-
 .../cdi/RouteDefinitionsFromXmlTest.java           |   4 +-
 .../camel-yaml-dsl-maven-plugin/pom.xml            |   4 +-
 .../maven/dsl/yaml/GenerateYamlSupportMojo.java    |  20 +-
 dsl/pom.xml                                        |  49 -----
 etc/pom.xml                                        |   2 +-
 jakarta/rewrite.java                               |   2 +-
 parent/pom.xml                                     | 213 +++++++--------------
 pom.xml                                            |  14 +-
 .../activemq/common/ConnectionFactoryHelper.java   |   2 +-
 .../services/AbstractActiveMQEmbeddedService.java  |   2 +-
 .../activemq/services/ConnectionFactoryAware.java  |   2 +-
 .../infra/jetty/services/JettyConfiguration.java   |   2 +-
 test-infra/pom.xml                                 |   2 +-
 tests/camel-itest-cdi/pom.xml                      |   8 +-
 .../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                     |   4 +-
 .../camel/itest/jms2/BaseJms2TestSupport.java      |  12 +-
 tests/camel-itest/pom.xml                          |  44 +----
 .../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/pom.xml                                      |  17 --
 tests/test-bundles/mock-javamail_1.7/pom.xml       |  13 --
 .../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                         |  32 ----
 tooling/camel-tooling-model/pom.xml                |  54 ------
 tooling/camel-tooling-util/pom.xml                 |  54 ------
 tooling/camel-util-json/pom.xml                    |  54 ------
 tooling/maven/camel-package-maven-plugin/pom.xml   |   6 +-
 .../camel/maven/packaging/EndpointDslMojo.java     |   2 +-
 .../packaging/ModelXmlParserGeneratorMojo.java     |  30 +--
 .../camel/maven/packaging/PackageJaxbMojo.java     |   6 +-
 .../camel/maven/packaging/SchemaGeneratorMojo.java |  16 +-
 .../ComponentDslBuilderFactoryGenerator.java       |   2 +-
 .../ComponentsBuilderFactoryGenerator.java         |   2 +-
 .../ComponentDslBuilderFactoryGeneratorTest.java   |   2 +-
 tooling/maven/camel-restdsl-openapi-plugin/pom.xml |   6 +-
 .../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 |   6 +-
 .../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                              |  15 --
 tooling/openapi-rest-dsl-generator/pom.xml         |  56 +-----
 .../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/pom.xml                                    |   1 -
 tooling/spi-annotations/pom.xml                    |  55 ------
 tooling/swagger-rest-dsl-generator/pom.xml         |  56 +-----
 .../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 +-
 2394 files changed, 6453 insertions(+), 8156 deletions(-)

diff --git a/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml b/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml
index dc092b4431a..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/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 3ec941fb81a..ef384a278d3 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -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 1fda068d505..8d2c7cdecef 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -38,7 +38,6 @@
     </modules>
 
     <properties>
-        <camel.osgi.export.pkg />
     </properties>
 
     <build>
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 a0943239696..cf953cc8b2b 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -60,8 +60,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>
@@ -83,28 +82,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>
@@ -114,15 +96,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>
@@ -150,11 +132,10 @@
     <corda-version>4.9.3</corda-version>
     <couchbase-client-version>3.4.1</couchbase-client-version>
     <curator-version>4.3.0</curator-version>
-    <cxf-codegen-plugin-version>3.5.5</cxf-codegen-plugin-version>
-    <cxf-version>3.5.5</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</cxf-codegen-plugin-version>
+    <cxf-version>4.0.0</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>
@@ -204,15 +185,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>
@@ -252,7 +232,7 @@
     <hazelcast-version>5.2.1</hazelcast-version>
     <hbase-version>2.5.2</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>
@@ -279,9 +259,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>
@@ -294,16 +274,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>
@@ -312,7 +291,6 @@
     <jbpm-version>7.64.0.Final</jbpm-version>
     <jcache-bundle-version>1.1.1_1</jcache-bundle-version>
     <jclouds-google-guava-version>27.1-jre</jclouds-google-guava-version>
-    <jclouds-google-guava-version-range>[27.0,28.0)</jclouds-google-guava-version-range>
     <jclouds-version>2.5.0</jclouds-version>
     <jcommander-version>1.72</jcommander-version>
     <jcr-version>2.0</jcr-version>
@@ -323,8 +301,7 @@
     <jettison-version>1.5.2</jettison-version>
     <jetty-plugin-version>${jetty-version}</jetty-plugin-version>
     <jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>
-    <jetty-version>${jetty9-version}</jetty-version>
-    <jetty9-version>9.4.50.v20221201</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>
@@ -381,7 +358,6 @@
     <log4j2-version>2.18.0</log4j2-version>
     <logback-version>1.2.11</logback-version>
     <lucene-version>8.11.1</lucene-version>
-    <lucene-version-range>[8,9)</lucene-version-range>
     <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>
@@ -418,7 +394,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>
@@ -466,7 +442,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>
@@ -479,7 +455,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>
@@ -489,7 +465,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>
@@ -507,7 +482,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>
@@ -519,10 +493,8 @@
     <spring-rabbitmq-version>2.4.8</spring-rabbitmq-version>
     <spring-security-version>5.8.1</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>
@@ -540,7 +512,7 @@
     <trimStackTrace>false</trimStackTrace>
     <twilio-version>7.55.3</twilio-version>
     <twitter4j-version>4.0.7</twitter4j-version>
-    <undertow-version>2.2.22.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>
@@ -550,7 +522,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.4.0</woodstox-core-version>
diff --git a/catalog/camel-allcomponents/pom.xml b/catalog/camel-allcomponents/pom.xml
index 123e61a36d0..027fb6a2370 100644
--- a/catalog/camel-allcomponents/pom.xml
+++ b/catalog/camel-allcomponents/pom.xml
@@ -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 e4f0917ec91..3b272cd428d 100644
--- a/catalog/camel-catalog-console/pom.xml
+++ b/catalog/camel-catalog-console/pom.xml
@@ -85,10 +85,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 68377e28d75..77813838910 100644
--- a/catalog/camel-catalog-lucene/pom.xml
+++ b/catalog/camel-catalog-lucene/pom.xml
@@ -84,10 +84,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/catalog/camel-catalog/pom.xml b/catalog/camel-catalog/pom.xml
index 2a4c87dda03..3775b73d238 100644
--- a/catalog/camel-catalog/pom.xml
+++ b/catalog/camel-catalog/pom.xml
@@ -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 c3b8e8f0a14..db0e58a80bf 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
@@ -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 5ac059fdf3a..494251f9f31 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
@@ -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/atmosphere-websocket.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atmosphere-websocket.json
index 705b1fb20d5..f7b4bdf61a6 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
@@ -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/bean-validator.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/bean-validator.json
index d892e5ceb86..445ae3edeb4 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
@@ -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/imap.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/imap.json
index d072b78807d..8ca152d7545 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
@@ -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 20ade5a1782..14de036e52a 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
@@ -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/jetty.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json
index b3df5be1a2a..fe16707e5ec 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
@@ -76,7 +76,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/jms.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jms.json
index 82a1aa0dff5..d5004ecdb06 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
@@ -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/jpa.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jpa.json
index 03a6e475fb5..c464fdf5424 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
@@ -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/pop3.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pop3.json
index 4123c9c238a..26597c48cda 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
@@ -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 877ce353767..d62e0ab9123 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
@@ -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/resteasy.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/resteasy.json
index 0cfa5ca7d08..ff60a768609 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
@@ -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/servlet.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/servlet.json
index fe10b790b8e..c5f11301215 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
@@ -46,7 +46,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/sjms.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sjms.json
index 4e374e9b7aa..21c7a638a1e 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
@@ -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 eb2b7bca282..bfb60ec963f 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
@@ -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/smtp.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smtp.json
index f6e7711d8cb..7b1d9006dee 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
@@ -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 603a87a0945..291d7777f20 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
@@ -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/websocket-jsr356.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/websocket-jsr356.json
index 4cb5530ec1f..21d7978e95c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/websocket-jsr356.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/websocket-jsr356.json
@@ -28,7 +28,7 @@
     "serverEndpointDeploymentStrategy": { "kind": "property", "displayName": "Server Endpoint Deployment Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.websocket.jsr356.ServerEndpointDeploymentStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To enable customization of how a WebSocket ServerEndpoint is configured and deployed. By default DefaultServerEndpointDeploymentStrategy is used." }
   },
   "headers": {
-    "jsr356.session": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "javax.websocket.Session", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The session.", "constantName": "org.apache.camel.websocket.jsr356.JSR356Constants#SESSION" },
+    "jsr356.session": { "kind": "header", "displayName": "", "group": "common", "label": "", "required": false, "javaType": "jakarta.websocket.Session", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The session.", "constantName": "org.apache.camel.websocket.jsr356.JSR356Constants#SESSION" },
     "jsr356.producer.session.incoming.use": { "kind": "header", "displayName": "", "group": "producer", "label": "producer", "required": false, "javaType": "Boolean", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Use incoming session", "constantName": "org.apache.camel.websocket.jsr356.JSR356Constants#USE_INCOMING_SESSION" }
   },
   "properties": {
diff --git a/catalog/camel-route-parser/pom.xml b/catalog/camel-route-parser/pom.xml
index 5fe09f580be..15897b7d829 100644
--- a/catalog/camel-route-parser/pom.xml
+++ b/catalog/camel-route-parser/pom.xml
@@ -92,20 +92,6 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-cdi</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <!-- Make MyCdi*RouteBuilder compile while cutting the useless dependency to JUnit 4 -->
-                <exclusion>
-                    <groupId>org.apache.camel</groupId>
-                    <artifactId>camel-test</artifactId>
-                </exclusion>
-            </exclusions>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiConcatRouteBuilder.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiConcatRouteBuilder.java
index a703f74945d..c3134535e8c 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiConcatRouteBuilder.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiConcatRouteBuilder.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.parser.java;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.EndpointInject;
diff --git a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiRouteBuilder.java b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiRouteBuilder.java
index 84dfe229e6f..fcb907fb024 100644
--- a/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiRouteBuilder.java
+++ b/catalog/camel-route-parser/src/test/java/org/apache/camel/parser/java/MyCdiRouteBuilder.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.parser.java;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/catalog/pom.xml b/catalog/pom.xml
index 8247b2a20a2..2b44dc2e63f 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -51,24 +51,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-                <version>${project.version}</version>
-                <configuration>
-                    <instructions>
-                    </instructions>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>net.revelc.code.formatter</groupId>
                 <artifactId>formatter-maven-plugin</artifactId>
diff --git a/components/camel-activemq/pom.xml b/components/camel-activemq/pom.xml
index 8d6bd4395b2..4edf13b999e 100644
--- a/components/camel-activemq/pom.xml
+++ b/components/camel-activemq/pom.xml
@@ -67,9 +67,9 @@
             <artifactId>activemq-pool</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
-            <version>1.1.1</version>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>${jakarta-annotation-api-version}</version>
             <optional>true</optional>
         </dependency>
 
diff --git a/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/converter/ActiveMQMessageConverterLoader.java b/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/converter/ActiveMQMessageConverterLoader.java
index 66f5397f339..dc8352e038e 100644
--- a/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/converter/ActiveMQMessageConverterLoader.java
+++ b/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/converter/ActiveMQMessageConverterLoader.java
@@ -43,8 +43,8 @@ public final class ActiveMQMessageConverterLoader implements TypeConverterLoader
     private void registerConverters(TypeConverterRegistry registry) {
         addTypeConverter(registry, org.apache.activemq.command.ActiveMQMessage.class, org.apache.camel.Exchange.class, false,
             (type, exchange, value) -> getActiveMQMessageConverter().toMessage((org.apache.camel.Exchange) value));
-        addTypeConverter(registry, org.apache.camel.Processor.class, javax.jms.MessageListener.class, false,
-            (type, exchange, value) -> getActiveMQMessageConverter().toProcessor((javax.jms.MessageListener) value));
+        addTypeConverter(registry, org.apache.camel.Processor.class, jakarta.jms.MessageListener.class, false,
+            (type, exchange, value) -> getActiveMQMessageConverter().toProcessor((jakarta.jms.MessageListener) value));
     }
 
     private static void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) { 
diff --git a/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json b/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json
index c3b8e8f0a14..db0e58a80bf 100644
--- a/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json
+++ b/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json
@@ -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/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
index e402a118a3e..09395ece300 100644
--- a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
+++ b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.activemq;
 
 import java.lang.reflect.Constructor;
 
-import javax.jms.ConnectionFactory;
+import jakarta.jms.ConnectionFactory;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.Service;
diff --git a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/OriginalDestinationPropagateStrategy.java b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/OriginalDestinationPropagateStrategy.java
index 3fbf82e1435..1c56c5d2b6c 100644
--- a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/OriginalDestinationPropagateStrategy.java
+++ b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/OriginalDestinationPropagateStrategy.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.component.activemq;
 
-import javax.jms.Message;
-import javax.jms.Session;
+import jakarta.jms.Message;
+import jakarta.jms.Session;
 
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQMessage;
diff --git a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/converter/ActiveMQMessageConverter.java b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/converter/ActiveMQMessageConverter.java
index 61426756373..c267e456240 100644
--- a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/converter/ActiveMQMessageConverter.java
+++ b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/converter/ActiveMQMessageConverter.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.activemq.converter;
 
 import java.io.Serializable;
 
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageListener;
 
 import org.apache.activemq.command.ActiveMQMessage;
 import org.apache.activemq.command.ActiveMQObjectMessage;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java
index 3be327d110f..f03f576a4dc 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.activemq;
 import java.util.Date;
 import java.util.List;
 
-import javax.jms.Destination;
+import jakarta.jms.Destination;
 
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.camel.CamelContext;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java
index 4c2e79a5743..b6248fa0446 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQOriginalDestinationTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.activemq;
 
-import javax.jms.Message;
+import jakarta.jms.Message;
 
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQMessage;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java
index 4b3a4f37927..2e1b19b80ee 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.jms.Destination;
+import jakarta.jms.Destination;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AdvisoryConsumerExampleTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AdvisoryConsumerExampleTest.java
index c593311ef8f..ffc2b15787a 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AdvisoryConsumerExampleTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AdvisoryConsumerExampleTest.java
@@ -59,7 +59,7 @@ public class AdvisoryConsumerExampleTest extends ActiveMQTestSupport {
                         Message in = exchange.getIn();
                         if (in instanceof JmsMessage) {
                             JmsMessage jmsMessage = (JmsMessage) in;
-                            javax.jms.Message value = jmsMessage.getJmsMessage();
+                            jakarta.jms.Message value = jmsMessage.getJmsMessage();
                             if (value instanceof ActiveMQMessage) {
                                 ActiveMQMessage activeMQMessage = (ActiveMQMessage) value;
                                 DataStructure structure = activeMQMessage.getDataStructure();
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelVMTransportRoutingTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelVMTransportRoutingTest.java
index 98ef5e6e545..7ff423c0b7a 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelVMTransportRoutingTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/CamelVMTransportRoutingTest.java
@@ -16,12 +16,12 @@
  */
 package org.apache.camel.component.activemq;
 
-import javax.jms.Connection;
-import javax.jms.Destination;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.Destination;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.util.ThreadTracker;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/DlqTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/DlqTest.java
index 0d231ae782d..3f267ed7bf9 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/DlqTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/DlqTest.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.component.activemq;
 
-import javax.jms.Connection;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.command.ActiveMQQueue;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/InvokeRequestReplyUsingJmsReplyToHeaderTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/InvokeRequestReplyUsingJmsReplyToHeaderTest.java
index e448adec48e..92c4f1836ca 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/InvokeRequestReplyUsingJmsReplyToHeaderTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/InvokeRequestReplyUsingJmsReplyToHeaderTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.activemq;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.jms.Destination;
+import jakarta.jms.Destination;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsBridge.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsBridge.java
index 091d7254146..ecd387b463d 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsBridge.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsBridge.java
@@ -19,12 +19,12 @@ package org.apache.camel.component.activemq;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.jms.Connection;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.Message;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerPlugin;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsConsumeSendTransacted.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsConsumeSendTransacted.java
index 40e75b8c30d..84f48d8da1d 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsConsumeSendTransacted.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsConsumeSendTransacted.java
@@ -18,12 +18,12 @@ package org.apache.camel.component.activemq;
 
 import java.util.Map;
 
-import javax.jms.Connection;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.Message;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.command.ActiveMQQueue;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXARollbackTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXARollbackTest.java
index e1517c006ec..e95fbbd12eb 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXARollbackTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXARollbackTest.java
@@ -20,14 +20,14 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Map;
 
-import javax.jms.Connection;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.Message;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
 import javax.sql.DataSource;
-import javax.transaction.TransactionManager;
+import jakarta.transaction.TransactionManager;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.region.policy.SharedDeadLetterStrategy;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXATest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXATest.java
index fa93ff51082..f8435554d60 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXATest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXATest.java
@@ -22,10 +22,10 @@ import java.sql.SQLException;
 import java.util.Map;
 import java.util.concurrent.Executors;
 
-import javax.jms.Connection;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
 import javax.sql.DataSource;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsSimpleRequestReplyTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsSimpleRequestReplyTest.java
index 48448996311..a7dde6011d5 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsSimpleRequestReplyTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsSimpleRequestReplyTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.activemq;
 
-import javax.jms.ConnectionFactory;
+import jakarta.jms.ConnectionFactory;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.pool.PooledConnectionFactory;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ObjectMessageTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ObjectMessageTest.java
index 6e9192ace3f..3359f969504 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ObjectMessageTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ObjectMessageTest.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.component.activemq;
 
-import javax.jms.Connection;
-import javax.jms.JMSException;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Session;
+import jakarta.jms.Connection;
+import jakarta.jms.JMSException;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.ObjectMessage;
+import jakarta.jms.Session;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.camel.Exchange;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/PoisonJMSPayloadTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/PoisonJMSPayloadTest.java
index c4e54059e9c..4b214973cee 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/PoisonJMSPayloadTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/PoisonJMSPayloadTest.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.component.activemq;
 
-import javax.jms.Connection;
-import javax.jms.JMSException;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Session;
+import jakarta.jms.Connection;
+import jakarta.jms.JMSException;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.ObjectMessage;
+import jakarta.jms.Session;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.camel.component.activemq.support.ActiveMQSpringTestSupport;
@@ -41,7 +41,7 @@ public class PoisonJMSPayloadTest extends ActiveMQSpringTestSupport {
         getMockEndpoint("mock:dead").expectedMessageCount(1);
         getMockEndpoint("mock:dead").message(0).body(String.class)
                 .startsWith(
-                        "Poison JMS message payload: Failed to extract body due to: javax.jms.JMSException: Failed to build body from content. Serializable class not available to broker.");
+                        "Poison JMS message payload: Failed to extract body due to: jakarta.jms.JMSException: Failed to build body from content. Serializable class not available to broker.");
 
         factory = new ActiveMQConnectionFactory(vmUri());
         Connection conn = factory.createConnection();
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java
index d60efb65036..acb3794eded 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java
@@ -20,10 +20,10 @@ import java.io.IOException;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
-import javax.jms.Connection;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/ConsumerBean.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/ConsumerBean.java
index 24df76e0fbf..cc1c505e993 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/ConsumerBean.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/ConsumerBean.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.activemq.converter;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.jms.Message;
-import javax.jms.MessageListener;
+import jakarta.jms.Message;
+import jakarta.jms.MessageListener;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeJmsMessageListenerTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeJmsMessageListenerTest.java
index 651958b4c34..e15432f09fa 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeJmsMessageListenerTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeJmsMessageListenerTest.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.component.activemq.converter;
 
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.TextMessage;
+import jakarta.jms.Message;
+import jakarta.jms.MessageListener;
+import jakarta.jms.TextMessage;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit5.CamelTestSupport;
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java
index fadff8bfe5a..d7a9a2645a9 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.activemq.converter;
 
 import java.util.List;
 
-import javax.jms.Message;
-import javax.jms.TextMessage;
+import jakarta.jms.Message;
+import jakarta.jms.TextMessage;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml
index b8a772090ec..0a7e41d7bca 100644
--- a/components/camel-amqp/pom.xml
+++ b/components/camel-amqp/pom.xml
@@ -35,12 +35,6 @@
     <properties>
         <!-- Wrapped qpid-jms-client requires invalid version of the package.
         Remove this after migration to ServiceMix bundles. -->
-        <camel.osgi.import>
-            org.apache.qpid.jms,
-            javax.jms;version="[1.1,3)",
-            ${camel.osgi.import.defaults},
-            *
-        </camel.osgi.import>
     </properties>
 
     <dependencies>
@@ -49,8 +43,8 @@
             <artifactId>camel-jms</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
+            <groupId>jakarta.jms</groupId>
+            <artifactId>jakarta.jms-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -88,7 +82,7 @@
         <!-- test infra -->
         <dependency>
             <groupId>org.apache.camel</groupId>
-            <artifactId>camel-test-infra-activemq</artifactId>
+            <artifactId>camel-test-infra-artemis</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
             <type>test-jar</type>
@@ -118,4 +112,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <testSourceDirectory>src/test/dummy</testSourceDirectory>
+    </build>
 </project>
diff --git a/components/camel-amqp/src/generated/resources/org/apache/camel/component/amqp/amqp.json b/components/camel-amqp/src/generated/resources/org/apache/camel/component/amqp/amqp.json
index 5ac059fdf3a..494251f9f31 100644
--- a/components/camel-amqp/src/generated/resources/org/apache/camel/component/amqp/amqp.json
+++ b/components/camel-amqp/src/generated/resources/org/apache/camel/component/amqp/amqp.json
@@ -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/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
index f7b974e809d..2de4e69142a 100644
--- a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
+++ b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.amqp;
 import java.util.Map;
 import java.util.Set;
 
-import javax.jms.ConnectionFactory;
+import jakarta.jms.ConnectionFactory;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
diff --git a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConfiguration.java b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConfiguration.java
index 4603c692265..bfb8e80bb98 100644
--- a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConfiguration.java
+++ b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPConfiguration.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.amqp;
 
-import javax.jms.ConnectionFactory;
+import jakarta.jms.ConnectionFactory;
 
 import org.apache.camel.component.jms.JmsConfiguration;
 import org.apache.camel.spi.UriParam;
diff --git a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPJmsBinding.java b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPJmsBinding.java
index 763670872ed..cfd3096ac09 100644
--- a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPJmsBinding.java
+++ b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPJmsBinding.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.amqp;
 
 import java.util.Map;
 
-import javax.jms.Message;
+import jakarta.jms.Message;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.component.jms.JmsBinding;
diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
index 21079ac5aa3..1f9d332bb0b 100644
--- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
+++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
@@ -18,12 +18,12 @@ package org.apache.camel.component.amqp;
 
 import java.util.function.Consumer;
 
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSException;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.JMSException;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
+import jakarta.jms.TextMessage;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.EndpointInject;
diff --git a/components/camel-asn1/pom.xml b/components/camel-asn1/pom.xml
index de0b36aa4f5..12ffdd0b9f1 100644
--- a/components/camel-asn1/pom.xml
+++ b/components/camel-asn1/pom.xml
@@ -87,9 +87,9 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>${jaxb-api-version}</version>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>${jakarta-xml-bind-api-version}</version>
             <optional>true</optional>
         </dependency>
     </dependencies>
diff --git a/components/camel-asterisk/pom.xml b/components/camel-asterisk/pom.xml
index 86e480a471e..edc7ce1fce9 100644
--- a/components/camel-asterisk/pom.xml
+++ b/components/camel-asterisk/pom.xml
@@ -32,9 +32,6 @@
     <description>Camel Asterisk to interact with an Asterisk PBX Server</description>
 
     <properties>
-        <camel.osgi.import.before.defaults>
-            org.asteriskjava.*;version="[1.0,4)"
-        </camel.osgi.import.before.defaults>
     </properties>
 
     <dependencies>
diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml
index 1d8e7381474..e5821445e50 100644
--- a/components/camel-atmosphere-websocket/pom.xml
+++ b/components/camel-atmosphere-websocket/pom.xml
@@ -33,19 +33,6 @@
     <description>Camel Atmosphere WebSocket Servlet</description>
 
     <properties>
-        <camel.osgi.import.pkg>
-            !org.apache.camel.component.atmosphere.websocket.*,
-            javax.activation.*;version="${javax-activation-version-range}",
-            javax.servlet.*;version="${servlet-version-range}",
-            org.atmosphere.*;version="${atmosphere-version-range}",
-            org.apache.catalina;resolution:=optional,
-            org.apache.catalina.comet;resolution:=optional,
-            org.eclipse.jetty.continuation;version="[9,10)";resolution:=optional,
-            org.eclipse.jetty.server;version="[9,10)";resolution:=optional,
-            org.eclipse.jetty.util.ssl;version="[9,10)";resolution:=optional,
-            ${camel.osgi.import.defaults},
-            *
-        </camel.osgi.import.pkg>
     </properties>
 
     <dependencies>
@@ -59,9 +46,9 @@
             <artifactId>camel-servlet</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax-servlet-api-version}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta-servlet-api-version}</version>
         </dependency>
 
         <!--  atmosphere -->
@@ -103,7 +90,7 @@
 
         <dependency>
             <groupId>org.eclipse.jetty.websocket</groupId>
-            <artifactId>websocket-server</artifactId>
+            <artifactId>websocket-jakarta-server</artifactId>
             <version>${jetty-version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/components/camel-atmosphere-websocket/src/generated/resources/org/apache/camel/component/atmosphere/websocket/atmosphere-websocket.json b/components/camel-atmosphere-websocket/src/generated/resources/org/apache/camel/component/atmosphere/websocket/atmosphere-websocket.json
index 705b1fb20d5..f7b4bdf61a6 100644
--- a/components/camel-atmosphere-websocket/src/generated/resources/org/apache/camel/component/atmosphere/websocket/atmosphere-websocket.json
+++ b/components/camel-atmosphere-websocket/src/generated/resources/org/apache/camel/component/atmosphere/websocket/atmosphere-websocket.json
@@ -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/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/CamelWebSocketServlet.java b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/CamelWebSocketServlet.java
index 1a583e5c5bb..4346f93cd61 100644
--- a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/CamelWebSocketServlet.java
+++ b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/CamelWebSocketServlet.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.atmosphere.websocket;
 import java.io.IOException;
 import java.util.Map;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.camel.component.servlet.CamelHttpTransportServlet;
 import org.apache.camel.http.common.HttpConsumer;
diff --git a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketConsumer.java b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketConsumer.java
index db108011a59..ee0d6586fc5 100644
--- a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketConsumer.java
+++ b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketConsumer.java
@@ -21,10 +21,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.Exchange;
diff --git a/components/camel-atom/pom.xml b/components/camel-atom/pom.xml
index 408b7e81a1d..d9806a59911 100644
--- a/components/camel-atom/pom.xml
+++ b/components/camel-atom/pom.xml
@@ -32,9 +32,6 @@
     <description>Camel Atom support</description>
 
     <properties>
-        <camel.osgi.import.additional>
-            org.apache.abdera.*;version="[0.4,2)"
-        </camel.osgi.import.additional>
     </properties>
 
     <dependencies>
diff --git a/components/camel-atom/src/test/java/org/apache/camel/component/atom/MyHttpServlet.java b/components/camel-atom/src/test/java/org/apache/camel/component/atom/MyHttpServlet.java
index 944fa4f7187..26f5eea893c 100644
--- a/components/camel-atom/src/test/java/org/apache/camel/component/atom/MyHttpServlet.java
+++ b/components/camel-atom/src/test/java/org/apache/camel/component/atom/MyHttpServlet.java
@@ -21,9 +21,9 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.FileUtils;
 
diff --git a/components/camel-attachments/pom.xml b/components/camel-attachments/pom.xml
index 99ab4f2cb3c..8f154358fce 100644
--- a/components/camel-attachments/pom.xml
+++ b/components/camel-attachments/pom.xml
@@ -33,9 +33,6 @@
     <description>Support for attachments on Camel messages</description>
 
     <properties>
-        <camel.osgi.import.before.defaults>
-            javax.activation.*;version="${javax-activation-version-range}"
-        </camel.osgi.import.before.defaults>
         <firstVersion>3.0.0</firstVersion>
         <label>core</label>
     </properties>
@@ -51,8 +48,8 @@
         <!-- attachments api -->
         <dependency>
             <groupId>com.sun.activation</groupId>
-            <artifactId>javax.activation</artifactId>
-            <version>${javax-activation-version}</version>
+            <artifactId>jakarta.activation</artifactId>
+            <version>${jakarta-activation-version}</version>
         </dependency>
 
         <!-- testing -->
diff --git a/components/camel-attachments/src/generated/java/org/apache/camel/attachment/AttachmentConverterLoader.java b/components/camel-attachments/src/generated/java/org/apache/camel/attachment/AttachmentConverterLoader.java
index d191b572134..8d3b4f6aa6e 100644
--- a/components/camel-attachments/src/generated/java/org/apache/camel/attachment/AttachmentConverterLoader.java
+++ b/components/camel-attachments/src/generated/java/org/apache/camel/attachment/AttachmentConverterLoader.java
@@ -41,7 +41,7 @@ public final class AttachmentConverterLoader implements TypeConverterLoader, Cam
     }
 
     private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, javax.activation.DataHandler.class, org.apache.camel.attachment.Attachment.class, false,
+        addTypeConverter(registry, jakarta.activation.DataHandler.class, org.apache.camel.attachment.Attachment.class, false,
             (type, exchange, value) -> org.apache.camel.attachment.AttachmentConverter.toDataHandler((org.apache.camel.attachment.Attachment) value));
         addTypeConverter(registry, org.apache.camel.attachment.AttachmentMessage.class, org.apache.camel.Message.class, false,
             (type, exchange, value) -> org.apache.camel.attachment.AttachmentConverter.toAttachmentMessage((org.apache.camel.Message) value));
diff --git a/components/camel-attachments/src/main/java/org/apache/camel/attachment/Attachment.java b/components/camel-attachments/src/main/java/org/apache/camel/attachment/Attachment.java
index 1584092035a..7bf419dace9 100644
--- a/components/camel-attachments/src/main/java/org/apache/camel/attachment/Attachment.java
+++ b/components/camel-attachments/src/main/java/org/apache/camel/attachment/Attachment.java
@@ -19,7 +19,7 @@ package org.apache.camel.attachment;
 import java.util.Collection;
 import java.util.List;
 
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
 
 import org.apache.camel.Message;
 
diff --git a/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentConverter.java b/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentConverter.java
index 3d395a64070..d4ff827c44b 100644
--- a/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentConverter.java
+++ b/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentConverter.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.attachment;
 
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
 
 import org.apache.camel.Converter;
 import org.apache.camel.Message;
diff --git a/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentMessage.java b/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentMessage.java
index 1a13007e570..b97461a09c3 100644
--- a/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentMessage.java
+++ b/components/camel-attachments/src/main/java/org/apache/camel/attachment/AttachmentMessage.java
@@ -19,12 +19,12 @@ package org.apache.camel.attachment;
 import java.util.Map;
 import java.util.Set;
 
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
 
 import org.apache.camel.Message;
 
 /**
- * Extended {@link Message} for Java Attachment Support (with javax.activation).
+ * Extended {@link Message} for Java Attachment Support (with jakarta.activation).
  */
 public interface AttachmentMessage extends Message {
 
diff --git a/components/camel-attachments/src/main/java/org/apache/camel/attachment/CamelFileDataSource.java b/components/camel-attachments/src/main/java/org/apache/camel/attachment/CamelFileDataSource.java
index edde8cbc06c..1f26d9d6db7 100644
--- a/components/camel-attachments/src/main/java/org/apache/camel/attachment/CamelFileDataSource.java
+++ b/components/camel-attachments/src/main/java/org/apache/camel/attachment/CamelFileDataSource.java
@@ -18,8 +18,8 @@ package org.apache.camel.attachment;
 
 import java.io.File;
 
-import javax.activation.FileDataSource;
-import javax.activation.FileTypeMap;
+import jakarta.activation.FileDataSource;
+import jakarta.activation.FileTypeMap;
 
 public class CamelFileDataSource extends FileDataSource {
     private final String fileName;
diff --git a/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachment.java b/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachment.java
index e55d1291d06..b1490975e38 100644
--- a/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachment.java
+++ b/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachment.java
@@ -22,8 +22,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
-import javax.activation.DataHandler;
-import javax.activation.DataSource;
+import jakarta.activation.DataHandler;
+import jakarta.activation.DataSource;
 
 import org.apache.camel.util.CollectionHelper;
 
diff --git a/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachmentMessage.java b/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachmentMessage.java
index 0d3e5416257..37f6c2ba202 100644
--- a/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachmentMessage.java
+++ b/components/camel-attachments/src/main/java/org/apache/camel/attachment/DefaultAttachmentMessage.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.function.Supplier;
 
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.ExtendedExchange;
diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java
index c58cdbb9428..ac4e285902b 100644
--- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java
+++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/BeanMethodWithExchangeTest.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.attachment;
 
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
+import jakarta.activation.DataHandler;
+import jakarta.activation.FileDataSource;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/BodyAndHeaderConvertTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/BodyAndHeaderConvertTest.java
index 67bb0f7b9ad..01ad2464728 100644
--- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/BodyAndHeaderConvertTest.java
+++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/BodyAndHeaderConvertTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.attachment;
 
 import java.net.URL;
 
-import javax.activation.DataHandler;
-import javax.activation.URLDataSource;
+import jakarta.activation.DataHandler;
+import jakarta.activation.URLDataSource;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java
index 2519b09bdf0..65fbd740989 100644
--- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java
+++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/MessageWithAttachmentRedeliveryIssueTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.attachment;
 
 import java.io.File;
 
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
+import jakarta.activation.DataHandler;
+import jakarta.activation.FileDataSource;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-attachments/src/test/java/org/apache/camel/attachment/WireTapTest.java b/components/camel-attachments/src/test/java/org/apache/camel/attachment/WireTapTest.java
index 5e8167ae14b..6d0aa8f18bd 100644
--- a/components/camel-attachments/src/test/java/org/apache/camel/attachment/WireTapTest.java
+++ b/components/camel-attachments/src/test/java/org/apache/camel/attachment/WireTapTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.attachment;
 import java.io.File;
 import java.util.Iterator;
 
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
+import jakarta.activation.DataHandler;
+import jakarta.activation.FileDataSource;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Producer.java b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Producer.java
index 6bc9501c3ee..cb1f0376483 100644
--- a/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Producer.java
+++ b/components/camel-aws/camel-aws2-ses/src/main/java/org/apache/camel/component/aws2/ses/Ses2Producer.java
@@ -58,7 +58,7 @@ public class Ses2Producer extends DefaultProducer {
 
     @Override
     public void process(Exchange exchange) throws Exception {
-        if (!(exchange.getIn().getBody() instanceof javax.mail.Message)) {
+        if (!(exchange.getIn().getBody() instanceof jakarta.mail.Message)) {
             SendEmailRequest request = createMailRequest(exchange);
             LOG.trace("Sending request [{}] from exchange [{}]...", request, exchange);
             SendEmailResponse result = getEndpoint().getSESClient().sendEmail(request);
@@ -112,7 +112,7 @@ public class Ses2Producer extends DefaultProducer {
     private software.amazon.awssdk.services.ses.model.RawMessage createRawMessage(Exchange exchange) throws Exception {
         software.amazon.awssdk.services.ses.model.RawMessage.Builder message
                 = software.amazon.awssdk.services.ses.model.RawMessage.builder();
-        javax.mail.Message content = exchange.getIn().getBody(javax.mail.Message.class);
+        jakarta.mail.Message content = exchange.getIn().getBody(jakarta.mail.Message.class);
         OutputStream byteOutput = new ByteArrayOutputStream();
         try {
             content.writeTo(byteOutput);
diff --git a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/MockMessage.java b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/MockMessage.java
index e82e3e50012..147b4fb12ec 100644
--- a/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/MockMessage.java
+++ b/components/camel-aws/camel-aws2-ses/src/test/java/org/apache/camel/component/aws2/ses/MockMessage.java
@@ -21,12 +21,12 @@ import java.io.OutputStream;
 import java.util.Date;
 import java.util.Enumeration;
 
-import javax.activation.DataHandler;
-import javax.mail.Address;
-import javax.mail.Flags;
-import javax.mail.Header;
-import javax.mail.Message;
-import javax.mail.Multipart;
+import jakarta.activation.DataHandler;
+import jakarta.mail.Address;
+import jakarta.mail.Flags;
+import jakarta.mail.Header;
+import jakarta.mail.Message;
+import jakarta.mail.Multipart;
 
 public class MockMessage extends Message {
 
diff --git a/components/camel-azure/camel-azure-cosmosdb/pom.xml b/components/camel-azure/camel-azure-cosmosdb/pom.xml
index bcb14ffcff5..7e43d3bc107 100644
--- a/components/camel-azure/camel-azure-cosmosdb/pom.xml
+++ b/components/camel-azure/camel-azure-cosmosdb/pom.xml
@@ -33,12 +33,6 @@
     <description>Camel Azure CosmosDB Component</description>
 
     <properties>
-      <camel.osgi.import.pkg>
-        !org.apache.camel.component.azure.cosmosdb*,
-        reactor*;version="[3,4)",
-        ${camel.osgi.import.defaults},
-        *
-      </camel.osgi.import.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-azure/camel-azure-eventhubs/pom.xml b/components/camel-azure/camel-azure-eventhubs/pom.xml
index cc4593d348f..ca0f9e10b9c 100644
--- a/components/camel-azure/camel-azure-eventhubs/pom.xml
+++ b/components/camel-azure/camel-azure-eventhubs/pom.xml
@@ -33,12 +33,6 @@
     <description>Camel Azure Event Hubs Component</description>
 
     <properties>
-      <camel.osgi.import.pkg>
-        !org.apache.camel.component.azure.eventhubs*,
-        reactor*;version="[3,4)",
-        ${camel.osgi.import.defaults},
-        *
-      </camel.osgi.import.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-azure/camel-azure-servicebus/pom.xml b/components/camel-azure/camel-azure-servicebus/pom.xml
index 2850c343aea..86b6ad801a6 100644
--- a/components/camel-azure/camel-azure-servicebus/pom.xml
+++ b/components/camel-azure/camel-azure-servicebus/pom.xml
@@ -33,12 +33,6 @@
     <description>Camel Azure ServiceBus Component</description>
 
     <properties>
-      <camel.osgi.import.pkg>
-        !org.apache.camel.component.azure.eventhubs*,
-        reactor*;version="[3,4)",
-        ${camel.osgi.import.defaults},
-        *
-      </camel.osgi.import.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorComponentConfigurer.java b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorComponentConfigurer.java
index b794d832414..007a882e54e 100644
--- a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorComponentConfigurer.java
+++ b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorComponentConfigurer.java
@@ -24,19 +24,19 @@ public class BeanValidatorComponentConfigurer extends PropertyConfigurerSupport
         case "autowiredenabled":
         case "autowiredEnabled": target.setAutowiredEnabled(property(camelContext, boolean.class, value)); return true;
         case "constraintvalidatorfactory":
-        case "constraintValidatorFactory": target.setConstraintValidatorFactory(property(camelContext, javax.validation.ConstraintValidatorFactory.class, value)); return true;
+        case "constraintValidatorFactory": target.setConstraintValidatorFactory(property(camelContext, jakarta.validation.ConstraintValidatorFactory.class, value)); return true;
         case "ignorexmlconfiguration":
         case "ignoreXmlConfiguration": target.setIgnoreXmlConfiguration(property(camelContext, boolean.class, value)); return true;
         case "lazystartproducer":
         case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
         case "messageinterpolator":
-        case "messageInterpolator": target.setMessageInterpolator(property(camelContext, javax.validation.MessageInterpolator.class, value)); return true;
+        case "messageInterpolator": target.setMessageInterpolator(property(camelContext, jakarta.validation.MessageInterpolator.class, value)); return true;
         case "traversableresolver":
-        case "traversableResolver": target.setTraversableResolver(property(camelContext, javax.validation.TraversableResolver.class, value)); return true;
+        case "traversableResolver": target.setTraversableResolver(property(camelContext, jakarta.validation.TraversableResolver.class, value)); return true;
         case "validationproviderresolver":
-        case "validationProviderResolver": target.setValidationProviderResolver(property(camelContext, javax.validation.ValidationProviderResolver.class, value)); return true;
+        case "validationProviderResolver": target.setValidationProviderResolver(property(camelContext, jakarta.validation.ValidationProviderResolver.class, value)); return true;
         case "validatorfactory":
-        case "validatorFactory": target.setValidatorFactory(property(camelContext, javax.validation.ValidatorFactory.class, value)); return true;
+        case "validatorFactory": target.setValidatorFactory(property(camelContext, jakarta.validation.ValidatorFactory.class, value)); return true;
         default: return false;
         }
     }
@@ -52,19 +52,19 @@ public class BeanValidatorComponentConfigurer extends PropertyConfigurerSupport
         case "autowiredenabled":
         case "autowiredEnabled": return boolean.class;
         case "constraintvalidatorfactory":
-        case "constraintValidatorFactory": return javax.validation.ConstraintValidatorFactory.class;
+        case "constraintValidatorFactory": return jakarta.validation.ConstraintValidatorFactory.class;
         case "ignorexmlconfiguration":
         case "ignoreXmlConfiguration": return boolean.class;
         case "lazystartproducer":
         case "lazyStartProducer": return boolean.class;
         case "messageinterpolator":
-        case "messageInterpolator": return javax.validation.MessageInterpolator.class;
+        case "messageInterpolator": return jakarta.validation.MessageInterpolator.class;
         case "traversableresolver":
-        case "traversableResolver": return javax.validation.TraversableResolver.class;
+        case "traversableResolver": return jakarta.validation.TraversableResolver.class;
         case "validationproviderresolver":
-        case "validationProviderResolver": return javax.validation.ValidationProviderResolver.class;
+        case "validationProviderResolver": return jakarta.validation.ValidationProviderResolver.class;
         case "validatorfactory":
-        case "validatorFactory": return javax.validation.ValidatorFactory.class;
+        case "validatorFactory": return jakarta.validation.ValidatorFactory.class;
         default: return null;
         }
     }
diff --git a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointConfigurer.java b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointConfigurer.java
index 0eb6d696348..09ce0db0de3 100644
--- a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointConfigurer.java
+++ b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointConfigurer.java
@@ -22,20 +22,20 @@ public class BeanValidatorEndpointConfigurer extends PropertyConfigurerSupport i
         BeanValidatorEndpoint target = (BeanValidatorEndpoint) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "constraintvalidatorfactory":
-        case "constraintValidatorFactory": target.setConstraintValidatorFactory(property(camelContext, javax.validation.ConstraintValidatorFactory.class, value)); return true;
+        case "constraintValidatorFactory": target.setConstraintValidatorFactory(property(camelContext, jakarta.validation.ConstraintValidatorFactory.class, value)); return true;
         case "group": target.setGroup(property(camelContext, java.lang.String.class, value)); return true;
         case "ignorexmlconfiguration":
         case "ignoreXmlConfiguration": target.setIgnoreXmlConfiguration(property(camelContext, boolean.class, value)); return true;
         case "lazystartproducer":
         case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
         case "messageinterpolator":
-        case "messageInterpolator": target.setMessageInterpolator(property(camelContext, javax.validation.MessageInterpolator.class, value)); return true;
+        case "messageInterpolator": target.setMessageInterpolator(property(camelContext, jakarta.validation.MessageInterpolator.class, value)); return true;
         case "traversableresolver":
-        case "traversableResolver": target.setTraversableResolver(property(camelContext, javax.validation.TraversableResolver.class, value)); return true;
+        case "traversableResolver": target.setTraversableResolver(property(camelContext, jakarta.validation.TraversableResolver.class, value)); return true;
         case "validationproviderresolver":
-        case "validationProviderResolver": target.setValidationProviderResolver(property(camelContext, javax.validation.ValidationProviderResolver.class, value)); return true;
+        case "validationProviderResolver": target.setValidationProviderResolver(property(camelContext, jakarta.validation.ValidationProviderResolver.class, value)); return true;
         case "validatorfactory":
-        case "validatorFactory": target.setValidatorFactory(property(camelContext, javax.validation.ValidatorFactory.class, value)); return true;
+        case "validatorFactory": target.setValidatorFactory(property(camelContext, jakarta.validation.ValidatorFactory.class, value)); return true;
         default: return false;
         }
     }
@@ -44,20 +44,20 @@ public class BeanValidatorEndpointConfigurer extends PropertyConfigurerSupport i
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "constraintvalidatorfactory":
-        case "constraintValidatorFactory": return javax.validation.ConstraintValidatorFactory.class;
+        case "constraintValidatorFactory": return jakarta.validation.ConstraintValidatorFactory.class;
         case "group": return java.lang.String.class;
         case "ignorexmlconfiguration":
         case "ignoreXmlConfiguration": return boolean.class;
         case "lazystartproducer":
         case "lazyStartProducer": return boolean.class;
         case "messageinterpolator":
-        case "messageInterpolator": return javax.validation.MessageInterpolator.class;
+        case "messageInterpolator": return jakarta.validation.MessageInterpolator.class;
         case "traversableresolver":
-        case "traversableResolver": return javax.validation.TraversableResolver.class;
+        case "traversableResolver": return jakarta.validation.TraversableResolver.class;
         case "validationproviderresolver":
-        case "validationProviderResolver": return javax.validation.ValidationProviderResolver.class;
+        case "validationProviderResolver": return jakarta.validation.ValidationProviderResolver.class;
         case "validatorfactory":
-        case "validatorFactory": return javax.validation.ValidatorFactory.class;
+        case "validatorFactory": return jakarta.validation.ValidatorFactory.class;
         default: return null;
         }
     }
diff --git a/components/camel-bean-validator/src/generated/resources/org/apache/camel/component/bean/validator/bean-validator.json b/components/camel-bean-validator/src/generated/resources/org/apache/camel/component/bean/validator/bean-validator.json
index d892e5ceb86..445ae3edeb4 100644
--- a/components/camel-bean-validator/src/generated/resources/org/apache/camel/component/bean/validator/bean-validator.json
+++ b/components/camel-bean-validator/src/generated/resources/org/apache/camel/component/bean/validator/bean-validator.json
@@ -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/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidationException.java b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidationException.java
index 68b1c58a59d..3df4f1a890e 100644
--- a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidationException.java
+++ b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidationException.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean.validator;
 
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolation;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.ValidationException;
diff --git a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
index 5e37cbff255..ea44fcd57fd 100644
--- a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
+++ b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorComponent.java
@@ -18,11 +18,11 @@ package org.apache.camel.component.bean.validator;
 
 import java.util.Map;
 
-import javax.validation.ConstraintValidatorFactory;
-import javax.validation.MessageInterpolator;
-import javax.validation.TraversableResolver;
-import javax.validation.ValidationProviderResolver;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.ConstraintValidatorFactory;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.TraversableResolver;
+import jakarta.validation.ValidationProviderResolver;
+import jakarta.validation.ValidatorFactory;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.spi.Metadata;
diff --git a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorEndpoint.java b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorEndpoint.java
index 46109559c9a..188010af77a 100644
--- a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorEndpoint.java
+++ b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorEndpoint.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.component.bean.validator;
 
-import javax.validation.ConstraintValidatorFactory;
-import javax.validation.MessageInterpolator;
-import javax.validation.TraversableResolver;
-import javax.validation.ValidationProviderResolver;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.ConstraintValidatorFactory;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.TraversableResolver;
+import jakarta.validation.ValidationProviderResolver;
+import jakarta.validation.ValidatorFactory;
 
 import org.apache.camel.Category;
 import org.apache.camel.Component;
@@ -47,7 +47,7 @@ public class BeanValidatorEndpoint extends DefaultEndpoint {
     @UriPath(description = "Where label is an arbitrary text value describing the endpoint")
     @Metadata(required = true)
     private String label;
-    @UriParam(defaultValue = "javax.validation.groups.Default")
+    @UriParam(defaultValue = "jakarta.validation.groups.Default")
     private String group;
     @UriParam
     private boolean ignoreXmlConfiguration;
diff --git a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorProducer.java b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorProducer.java
index f5f736197b7..7ad8f60ba28 100644
--- a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorProducer.java
+++ b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/BeanValidatorProducer.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.bean.validator;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ValidatorFactory;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.support.DefaultProducer;
diff --git a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolver.java b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolver.java
index df0a33bb24a..0751b0f57cf 100644
--- a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolver.java
+++ b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolver.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.bean.validator;
 
 import java.util.List;
 
-import javax.validation.ValidationProviderResolver;
+import jakarta.validation.ValidationProviderResolver;
 
 import org.hibernate.validator.HibernateValidator;
 
diff --git a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/ValidationProviderResolverFactory.java b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/ValidationProviderResolverFactory.java
index ee4cea7a991..b78a00094d6 100644
--- a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/ValidationProviderResolverFactory.java
+++ b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/ValidationProviderResolverFactory.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.bean.validator;
 
-import javax.validation.ValidationProviderResolver;
+import jakarta.validation.ValidationProviderResolver;
 
 import org.apache.camel.CamelContext;
 
diff --git a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/ValidatorFactories.java b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/ValidatorFactories.java
index 65e238252c8..b088f8ec751 100644
--- a/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/ValidatorFactories.java
+++ b/components/camel-bean-validator/src/main/java/org/apache/camel/component/bean/validator/ValidatorFactories.java
@@ -16,20 +16,20 @@
  */
 package org.apache.camel.component.bean.validator;
 
-import javax.validation.Configuration;
-import javax.validation.ConstraintValidatorFactory;
-import javax.validation.MessageInterpolator;
-import javax.validation.TraversableResolver;
-import javax.validation.Validation;
-import javax.validation.ValidationProviderResolver;
-import javax.validation.ValidatorFactory;
-import javax.validation.bootstrap.GenericBootstrap;
+import jakarta.validation.Configuration;
+import jakarta.validation.ConstraintValidatorFactory;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.TraversableResolver;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidationProviderResolver;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.bootstrap.GenericBootstrap;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.support.CamelContextHelper;
 
 /**
- * Utility class dedicated to create new {@code javax.validation.ValidatorFactory} instances.
+ * Utility class dedicated to create new {@code jakarta.validation.ValidatorFactory} instances.
  */
 public final class ValidatorFactories {
 
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
index 16f741319b2..c3d8beda559 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java
@@ -19,12 +19,12 @@ package org.apache.camel.component.bean.validator;
 import java.lang.annotation.ElementType;
 import java.util.Locale;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorFactory;
-import javax.validation.MessageInterpolator;
-import javax.validation.Path;
-import javax.validation.Path.Node;
-import javax.validation.TraversableResolver;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorFactory;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.Path;
+import jakarta.validation.Path.Node;
+import jakarta.validation.TraversableResolver;
 
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.test.junit5.CamelTestSupport;
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java
index d0fb2db3bef..cdfb0036a37 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java
@@ -21,7 +21,7 @@ import java.util.Locale;
 import java.util.Set;
 import java.util.stream.Stream;
 
-import javax.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolation;
 
 import org.apache.camel.CamelExecutionException;
 import org.apache.camel.Exchange;
@@ -74,7 +74,7 @@ class BeanValidatorRouteTest extends CamelTestSupport {
     @MethodSource("provideValidCars")
     void validateShouldSuccessWithExpliciteDefaultGroup(Object cars) {
 
-        Exchange exchange = template.request("bean-validator://x?group=javax.validation.groups.Default", new Processor() {
+        Exchange exchange = template.request("bean-validator://x?group=jakarta.validation.groups.Default", new Processor() {
             public void process(Exchange exchange) {
                 exchange.getIn().setBody(cars);
             }
@@ -121,7 +121,7 @@ class BeanValidatorRouteTest extends CamelTestSupport {
     @MethodSource("provideInvalidCarsWithoutLicensePlate")
     void validateShouldFailWithExpliciteDefaultGroup(Object cars, int numberOfViolations) {
 
-        final String url = "bean-validator://x?group=javax.validation.groups.Default";
+        final String url = "bean-validator://x?group=jakarta.validation.groups.Default";
 
         try {
             template.requestBody(url, cars);
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithAnnotations.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithAnnotations.java
index 97dd1891cf9..ea5ced43f48 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithAnnotations.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithAnnotations.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.component.bean.validator;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 public class CarWithAnnotations implements Car {
 
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithRedefinedDefaultGroup.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithRedefinedDefaultGroup.java
index 10e450e8fa0..f9dcfa759d9 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithRedefinedDefaultGroup.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CarWithRedefinedDefaultGroup.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.component.bean.validator;
 
-import javax.validation.GroupSequence;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.GroupSequence;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 @GroupSequence({ CarWithRedefinedDefaultGroup.class, OptionalChecks.class })
 public class CarWithRedefinedDefaultGroup implements Car {
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java
index ce0c2064e19..7fce18c0512 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/CustomValidationProviderResolverTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.bean.validator;
 
 import java.util.List;
 
-import javax.validation.ValidationProviderResolver;
-import javax.validation.spi.ValidationProvider;
+import jakarta.validation.ValidationProviderResolver;
+import jakarta.validation.spi.ValidationProvider;
 
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java
index 0f49882b72a..0f6b4c8e482 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/HibernateValidationProviderResolverTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.bean.validator;
 
-import javax.validation.ValidationProviderResolver;
+import jakarta.validation.ValidationProviderResolver;
 
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.EndpointInject;
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/OrderedChecks.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/OrderedChecks.java
index df7fd2b3f98..2a5793aae0a 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/OrderedChecks.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/OrderedChecks.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.component.bean.validator;
 
-import javax.validation.GroupSequence;
-import javax.validation.groups.Default;
+import jakarta.validation.GroupSequence;
+import jakarta.validation.groups.Default;
 
 @GroupSequence({ Default.class, OptionalChecks.class })
 public interface OrderedChecks {
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryAutowireTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryAutowireTest.java
index 161a5938b36..ed070a10fb9 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryAutowireTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryAutowireTest.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.component.bean.validator;
 
-import javax.validation.Validation;
-import javax.validation.ValidatorFactory;
-import javax.validation.bootstrap.GenericBootstrap;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.bootstrap.GenericBootstrap;
 
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.test.junit5.CamelTestSupport;
diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryRegistryTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryRegistryTest.java
index dc2808ba716..798072b0baa 100644
--- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryRegistryTest.java
+++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/ValidatorFactoryRegistryTest.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.component.bean.validator;
 
-import javax.validation.Validation;
-import javax.validation.ValidatorFactory;
-import javax.validation.bootstrap.GenericBootstrap;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.bootstrap.GenericBootstrap;
 
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.test.junit5.CamelTestSupport;
diff --git a/components/camel-bonita/pom.xml b/components/camel-bonita/pom.xml
index 1208fffbcce..81bc24eae07 100644
--- a/components/camel-bonita/pom.xml
+++ b/components/camel-bonita/pom.xml
@@ -35,9 +35,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <camel.osgi.import.additional>
-            org.apache.cxf.*;version="${cxf-version-range}"
-        </camel.osgi.import.additional>
     </properties>
 
     <dependencies>
@@ -54,8 +51,8 @@
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs-json-provider</artifactId>
+            <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+            <artifactId>jackson-jakarta-rs-json-provider</artifactId>
         </dependency>
 
         <!-- testing -->
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPI.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPI.java
index b76e8a8e0e2..7f85c30fa31 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPI.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPI.java
@@ -20,9 +20,9 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.MediaType;
 
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.component.bonita.api.model.CaseCreationResponse;
@@ -31,7 +31,7 @@ import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
 import org.apache.camel.component.bonita.api.util.BonitaAPIUtil;
 import org.apache.camel.util.ObjectHelper;
 
-import static javax.ws.rs.client.Entity.entity;
+import static jakarta.ws.rs.client.Entity.entity;
 
 public class BonitaAPI {
 
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPIBuilder.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPIBuilder.java
index 311d77c10c3..cedf13c7071 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPIBuilder.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/BonitaAPIBuilder.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.component.bonita.api;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
 
-import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider;
 import org.apache.camel.component.bonita.api.filter.BonitaAuthFilter;
 import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
 
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/BonitaAuthFilter.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/BonitaAuthFilter.java
index 4160aeac283..25fef8c7b05 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/BonitaAuthFilter.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/BonitaAuthFilter.java
@@ -20,17 +20,17 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Map;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientRequestFilter;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.NewCookie;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.client.ClientRequestFilter;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.NewCookie;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
 import org.apache.camel.util.ObjectHelper;
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/JsonClientFilter.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/JsonClientFilter.java
index 9acc24766da..78467f91afc 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/JsonClientFilter.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/filter/JsonClientFilter.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.bonita.api.filter;
 
 import java.io.IOException;
 
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientResponseContext;
-import javax.ws.rs.client.ClientResponseFilter;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.client.ClientResponseContext;
+import jakarta.ws.rs.client.ClientResponseFilter;
 
 public class JsonClientFilter implements ClientResponseFilter {
 
diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtil.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtil.java
index 8761ac54044..950fdf068f9 100644
--- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtil.java
+++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/api/util/BonitaAPIUtil.java
@@ -25,12 +25,12 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.MediaType;
 
-import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider;
 import org.apache.camel.component.bonita.api.filter.BonitaAuthFilter;
 import org.apache.camel.component.bonita.api.filter.JsonClientFilter;
 import org.apache.camel.component.bonita.api.model.FileInput;
@@ -40,7 +40,7 @@ import org.apache.cxf.jaxrs.ext.multipart.Attachment;
 import org.apache.cxf.jaxrs.ext.multipart.AttachmentBuilder;
 import org.apache.cxf.jaxrs.ext.multipart.ContentDisposition;
 
-import static javax.ws.rs.client.Entity.entity;
+import static jakarta.ws.rs.client.Entity.entity;
 
 public class BonitaAPIUtil {
 
diff --git a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterAlreadyConnectedTest.java b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterAlreadyConnectedTest.java
index b2a75f5f582..c8950b69610 100644
--- a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterAlreadyConnectedTest.java
+++ b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterAlreadyConnectedTest.java
@@ -20,8 +20,8 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.core.Cookie;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.core.Cookie;
 
 import org.apache.camel.component.bonita.api.filter.BonitaAuthFilter;
 import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
diff --git a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java
index d272c3eb385..57bc0aefeb1 100644
--- a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java
+++ b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterConnectionTest.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.bonita.api;
 
 import java.util.HashMap;
 
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.core.Cookie;
-import javax.ws.rs.core.MultivaluedHashMap;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.core.Cookie;
+import jakarta.ws.rs.core.MultivaluedHashMap;
 
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
diff --git a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterTest.java b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterTest.java
index 2df382c2cf7..4cb9a722c16 100644
--- a/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterTest.java
+++ b/components/camel-bonita/src/test/java/org/apache/camel/component/bonita/api/BonitaAuthFilterTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.bonita.api;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.core.Cookie;
+import jakarta.ws.rs.client.ClientRequestContext;
+import jakarta.ws.rs.core.Cookie;
 
 import org.apache.camel.component.bonita.api.filter.BonitaAuthFilter;
 import org.apache.camel.component.bonita.api.util.BonitaAPIConfig;
diff --git a/components/camel-box/camel-box-api/pom.xml b/components/camel-box/camel-box-api/pom.xml
index 79bbdd07be9..0a5b2eeb0e9 100644
--- a/components/camel-box/camel-box-api/pom.xml
+++ b/components/camel-box/camel-box-api/pom.xml
@@ -37,9 +37,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <firstVersion>2.19.0</firstVersion>
-        <camel.osgi.import.pkg>
-            *
-        </camel.osgi.import.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-braintree/pom.xml b/components/camel-braintree/pom.xml
index 77e4fe04722..f10a6a61df6 100644
--- a/components/camel-braintree/pom.xml
+++ b/components/camel-braintree/pom.xml
@@ -41,7 +41,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <camel.osgi.private.pkg>${outPackage}</camel.osgi.private.pkg>
     </properties>
 
     <dependencies>
diff --git a/components/camel-caffeine-lrucache/pom.xml b/components/camel-caffeine-lrucache/pom.xml
index f0e9ec57288..1ead3c9e37d 100644
--- a/components/camel-caffeine-lrucache/pom.xml
+++ b/components/camel-caffeine-lrucache/pom.xml
@@ -66,35 +66,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-bundle-plugin</artifactId>
-                <version>${project.version}</version>
-                <extensions>false</extensions>
-                <configuration>
-                    <supportIncrementalBuild>true</supportIncrementalBuild>
-                    <noWarningProjectTypes>pom</noWarningProjectTypes>
-                    <excludeDependencies>${camel.osgi.exclude.dependencies}</excludeDependencies>
-                    <instructions>
-                        <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Bundle-SymbolicName>${camel.osgi.symbolic.name}</Bundle-SymbolicName>
-                        <Bundle-Activator>${camel.osgi.activator}</Bundle-Activator>
-                        <Import-Package>${camel.osgi.import}</Import-Package>
-                        <Export-Package>${camel.osgi.export}</Export-Package>
-                        <DynamicImport-Package>${camel.osgi.dynamic}</DynamicImport-Package>
-                        <Private-Package>${camel.osgi.private.pkg}</Private-Package>
-                        <Require-Capability>${camel.osgi.require.capability}</Require-Capability>
-                        <Provide-Capability>${camel.osgi.provide.capability}</Provide-Capability>
-                        <Fragment-Host>org.apache.camel.camel-support</Fragment-Host>
-                        <Implementation-Title>Apache Camel</Implementation-Title>
-                        <Implementation-Version>${project.version}</Implementation-Version>
-                        <Karaf-Info>Camel;${project.artifactId}=${project.version}</Karaf-Info>
-                        <_versionpolicy>${camel.osgi.import.default.version}</_versionpolicy>
-                        <_failok>${camel.osgi.failok}</_failok>
-                        <_removeheaders>Bnd-LastModified</_removeheaders>
-                    </instructions>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/components/camel-cdi-jta/pom.xml b/components/camel-cdi-jta/pom.xml
index c942d46ff9b..e3e20068861 100644
--- a/components/camel-cdi-jta/pom.xml
+++ b/components/camel-cdi-jta/pom.xml
@@ -50,9 +50,9 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
-            <version>${cdi-api-2.0-version}</version>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <version>${jakarta-enterprise-cdi-api-version}</version>
         </dependency>
         <dependency>
             <groupId>javax.transaction</groupId>
diff --git a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/MandatoryJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/MandatoryJtaTransactionPolicy.java
index d6af7fa04ef..0fb5dc332b8 100644
--- a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/MandatoryJtaTransactionPolicy.java
+++ b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/MandatoryJtaTransactionPolicy.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.transaction;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 @Named("PROPAGATION_MANDATORY")
 public class MandatoryJtaTransactionPolicy extends TransactionalJtaTransactionPolicy {
diff --git a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NestedJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NestedJtaTransactionPolicy.java
index 7c8394eda4a..6064b161b79 100644
--- a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NestedJtaTransactionPolicy.java
+++ b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NestedJtaTransactionPolicy.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.transaction;
 
-import javax.inject.Named;
-import javax.transaction.Transaction;
+import jakarta.inject.Named;
+import jakarta.transaction.Transaction;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NeverJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NeverJtaTransactionPolicy.java
index 0f9fa6caf87..29eb28d92d9 100644
--- a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NeverJtaTransactionPolicy.java
+++ b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NeverJtaTransactionPolicy.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.transaction;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 @Named("PROPAGATION_NEVER")
 public class NeverJtaTransactionPolicy extends TransactionalJtaTransactionPolicy {
diff --git a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NotSupportedJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NotSupportedJtaTransactionPolicy.java
index 0d5ea37ee39..ce541706427 100644
--- a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NotSupportedJtaTransactionPolicy.java
+++ b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/NotSupportedJtaTransactionPolicy.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.transaction;
 
-import javax.inject.Named;
-import javax.transaction.Transaction;
+import jakarta.inject.Named;
+import jakarta.transaction.Transaction;
 
 @Named("PROPAGATION_NOT_SUPPORTED")
 public class NotSupportedJtaTransactionPolicy extends TransactionalJtaTransactionPolicy {
diff --git a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiredJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiredJtaTransactionPolicy.java
index f0bced3087a..cf1ffdbb0ca 100644
--- a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiredJtaTransactionPolicy.java
+++ b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiredJtaTransactionPolicy.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.transaction;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 @Named("PROPAGATION_REQUIRED")
 public class RequiredJtaTransactionPolicy extends TransactionalJtaTransactionPolicy {
diff --git a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiresNewJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiresNewJtaTransactionPolicy.java
index e9d763826d8..90b550d462b 100644
--- a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiresNewJtaTransactionPolicy.java
+++ b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/RequiresNewJtaTransactionPolicy.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.transaction;
 
-import javax.inject.Named;
-import javax.transaction.Transaction;
+import jakarta.inject.Named;
+import jakarta.transaction.Transaction;
 
 @Named("PROPAGATION_REQUIRES_NEW")
 public class RequiresNewJtaTransactionPolicy extends TransactionalJtaTransactionPolicy {
diff --git a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/SupportsJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/SupportsJtaTransactionPolicy.java
index 74bf7e52bca..541281e7a82 100644
--- a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/SupportsJtaTransactionPolicy.java
+++ b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/SupportsJtaTransactionPolicy.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.transaction;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 @Named("PROPAGATION_SUPPORTS")
 public class SupportsJtaTransactionPolicy extends TransactionalJtaTransactionPolicy {
diff --git a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java
index 2f571354d55..388bf8acd13 100644
--- a/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java
+++ b/components/camel-cdi-jta/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java
@@ -21,13 +21,13 @@ import java.util.stream.Stream;
 
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import javax.transaction.RollbackException;
-import javax.transaction.Status;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
+import jakarta.transaction.HeuristicMixedException;
+import jakarta.transaction.HeuristicRollbackException;
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.Status;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.Transaction;
+import jakarta.transaction.TransactionManager;
 
 import org.apache.camel.CamelException;
 import org.apache.camel.jta.JtaTransactionPolicy;
diff --git a/components/camel-cdi-main/pom.xml b/components/camel-cdi-main/pom.xml
index efee404549e..f4f391e3666 100644
--- a/components/camel-cdi-main/pom.xml
+++ b/components/camel-cdi-main/pom.xml
@@ -50,9 +50,9 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
-            <version>${cdi-api-2.0-version}</version>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <version>${jakarta-enterprise-cdi-api-version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/components/camel-cdi-main/src/main/java/org/apache/camel/cdi/Main.java b/components/camel-cdi-main/src/main/java/org/apache/camel/cdi/Main.java
index bfb8b21d9e3..05806922c2e 100644
--- a/components/camel-cdi-main/src/main/java/org/apache/camel/cdi/Main.java
+++ b/components/camel-cdi-main/src/main/java/org/apache/camel/cdi/Main.java
@@ -19,13 +19,13 @@ package org.apache.camel.cdi;
 import java.util.Map;
 import java.util.Set;
 
-import javax.enterprise.context.control.RequestContextController;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.UnsatisfiedResolutionException;
-import javax.enterprise.inject.se.SeContainer;
-import javax.enterprise.inject.se.SeContainerInitializer;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.control.RequestContextController;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.UnsatisfiedResolutionException;
+import jakarta.enterprise.inject.se.SeContainer;
+import jakarta.enterprise.inject.se.SeContainerInitializer;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index 9acc2ce8376..fbfc3e30639 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -170,10 +170,9 @@
 
         <!-- provided dependencies -->
         <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
-            <version>${cdi-api-2.0-version}</version>
-            <scope>provided</scope>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <version>${jakarta-enterprise-cdi-api-version}</version>
         </dependency>
 
         <!-- test dependencies -->
@@ -181,7 +180,7 @@
         <dependency>
             <groupId>org.jboss.weld</groupId>
             <artifactId>weld-core-impl</artifactId>
-            <version>${weld3-version}</version>
+            <version>${weld-version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -253,7 +252,7 @@
                                 <artifactItem>
                                     <groupId>jakarta.xml.bind</groupId>
                                     <artifactId>jakarta.xml.bind-api</artifactId>
-                                    <version>${jakarta-jaxb-version}</version>
+                                    <version>${jakarta-xml-bind-api-version}</version>
                                     <overWrite>false</overWrite>
                                     <outputDirectory>${project.basedir}/target/java9</outputDirectory>
                                 </artifactItem>
@@ -295,10 +294,9 @@
                 <!-- provided dependencies -->
 
                 <dependency>
-                    <groupId>javax.enterprise</groupId>
-                    <artifactId>cdi-api</artifactId>
-                    <version>${cdi-api-2.0-version}</version>
-                    <scope>provided</scope>
+                    <groupId>jakarta.enterprise</groupId>
+                    <artifactId>jakarta.enterprise.cdi-api</artifactId>
+                    <version>${jakarta-enterprise-cdi-api-version}</version>
                 </dependency>
 
                 <!-- test dependencies -->
@@ -306,7 +304,7 @@
                 <dependency>
                     <groupId>org.jboss.weld</groupId>
                     <artifactId>weld-core-impl</artifactId>
-                    <version>${weld3-version}</version>
+                    <version>${weld-version}</version>
                     <scope>test</scope>
                 </dependency>
 
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java
index 0ae285a2dde..d670ea9327f 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java
@@ -21,8 +21,8 @@ import java.lang.reflect.Type;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.Annotated;
 
 import static java.util.stream.Collectors.toSet;
 import static org.apache.camel.cdi.CdiSpiHelper.isAnnotationType;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMemberDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMemberDelegate.java
index 6518ec40512..759fa064780 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMemberDelegate.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMemberDelegate.java
@@ -20,9 +20,9 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.Member;
 import java.util.Set;
 
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.AnnotatedMember;
-import javax.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.AnnotatedMember;
+import jakarta.enterprise.inject.spi.AnnotatedType;
 
 @Vetoed
 class AnnotatedMemberDelegate<T> extends AnnotatedDelegate implements AnnotatedMember<T> {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMethodDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMethodDelegate.java
index 72d16a293db..3aa76ae0fd9 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMethodDelegate.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMethodDelegate.java
@@ -21,9 +21,9 @@ import java.lang.reflect.Method;
 import java.util.List;
 import java.util.Set;
 
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedParameter;
 
 @Vetoed
 final class AnnotatedMethodDelegate<T> extends AnnotatedMemberDelegate<T> implements AnnotatedMethod<T> {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedTypeDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedTypeDelegate.java
index 1a469a41f87..1fe8406df4e 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedTypeDelegate.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedTypeDelegate.java
@@ -19,11 +19,11 @@ package org.apache.camel.cdi;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.AnnotatedConstructor;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
 
 @Vetoed
 final class AnnotatedTypeDelegate<T> extends AnnotatedDelegate implements AnnotatedType<T> {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ApplicationScopedLiteral.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ApplicationScopedLiteral.java
index 5e707ad2d32..5b316958d59 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ApplicationScopedLiteral.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ApplicationScopedLiteral.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.util.AnnotationLiteral;
 
 @Vetoed
 final class ApplicationScopedLiteral extends AnnotationLiteral<ApplicationScoped> implements ApplicationScoped {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java
index 4111b2861fb..6d47dbd45fd 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java
@@ -22,10 +22,10 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
 
 @Vetoed
 final class BeanDelegate<T> implements Bean<T> {
@@ -83,12 +83,7 @@ final class BeanDelegate<T> implements Bean<T> {
         return delegate.getInjectionPoints();
     }
 
-    @Override
-    public boolean isNullable() {
-        return delegate.isNullable();
-    }
-
-    @Override
+       @Override
     public T create(CreationalContext<T> creationalContext) {
         return delegate.create(creationalContext);
     }
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanManagerHelper.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanManagerHelper.java
index 1609607fde2..22d663920ed 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanManagerHelper.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanManagerHelper.java
@@ -20,8 +20,8 @@ import java.lang.annotation.Annotation;
 import java.util.Optional;
 import java.util.Set;
 
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
 
 import static java.util.stream.Collectors.toSet;
 
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelBeanInjectionTarget.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelBeanInjectionTarget.java
index e9eb003d42c..58eb1db8450 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelBeanInjectionTarget.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelBeanInjectionTarget.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.cdi;
 
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.InjectionException;
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.InjectionException;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionTarget;
 
 @Vetoed
 final class CamelBeanInjectionTarget<T> extends DelegateInjectionTarget<T> implements InjectionTarget<T> {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextInjectionTarget.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextInjectionTarget.java
index b3e7db9e88d..bdcd705ac06 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextInjectionTarget.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextInjectionTarget.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.cdi;
 
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.Producer;
 
 import org.apache.camel.CamelContext;
 
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextProducer.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextProducer.java
index 68b19581c68..f960e2340f3 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextProducer.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextProducer.java
@@ -19,17 +19,17 @@ package org.apache.camel.cdi;
 import java.lang.annotation.Annotation;
 import java.util.Set;
 
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.InjectionException;
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Producer;
-import javax.inject.Named;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.InjectionException;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Producer;
+import jakarta.inject.Named;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.impl.DefaultCamelContext;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
index 2d5839a8225..909976e22c2 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanPostProcessor.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi;
 
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeanManager;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.impl.engine.DefaultCamelBeanPostProcessor;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanRepository.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanRepository.java
index 8fc7cc0a3dd..0009a1aae70 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanRepository.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelBeanRepository.java
@@ -19,9 +19,9 @@ package org.apache.camel.cdi;
 import java.util.Map;
 import java.util.Set;
 
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
 
 import org.apache.camel.component.properties.PropertiesComponent;
 import org.apache.camel.spi.BeanRepository;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelConfigurationEvent.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelConfigurationEvent.java
index 1cef27f786f..0a6bd999649 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelConfigurationEvent.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelConfigurationEvent.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi;
 
-import javax.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.Vetoed;
 
 @Vetoed
 /* package-private */ final class CdiCamelConfigurationEvent implements CdiCamelConfiguration {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelEnvironment.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelEnvironment.java
index f6f76418ea4..9d009032f05 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelEnvironment.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelEnvironment.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.cdi;
 
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.Producer;
 
 import org.apache.camel.CamelContext;
 
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
index aac4b848071..43b10d2a183 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
@@ -31,30 +31,30 @@ import java.util.function.BooleanSupplier;
 import java.util.function.Function;
 import java.util.stream.Stream;
 
-import javax.enterprise.context.Dependent;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.InjectionException;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import javax.enterprise.inject.spi.ProcessBean;
-import javax.enterprise.inject.spi.ProcessInjectionTarget;
-import javax.enterprise.inject.spi.ProcessObserverMethod;
-import javax.enterprise.inject.spi.ProcessProducer;
-import javax.enterprise.inject.spi.ProcessProducerField;
-import javax.enterprise.inject.spi.ProcessProducerMethod;
-import javax.enterprise.inject.spi.configurator.BeanConfigurator;
-import javax.inject.Named;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.InjectionException;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.AfterDeploymentValidation;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.inject.spi.ProcessBean;
+import jakarta.enterprise.inject.spi.ProcessInjectionTarget;
+import jakarta.enterprise.inject.spi.ProcessObserverMethod;
+import jakarta.enterprise.inject.spi.ProcessProducer;
+import jakarta.enterprise.inject.spi.ProcessProducerField;
+import jakarta.enterprise.inject.spi.ProcessProducerMethod;
+import jakarta.enterprise.inject.spi.configurator.BeanConfigurator;
+import jakarta.inject.Named;
 
 import org.apache.camel.BeanInject;
 import org.apache.camel.CamelContext;
@@ -412,7 +412,7 @@ public class CdiCamelExtension implements Extension {
 
     private void afterDeploymentValidation(@Observes AfterDeploymentValidation adv, BeanManager manager) {
         // Send event for Camel CDI configuration
-        manager.fireEvent(configuration);
+        manager.getEvent().fire(configuration);
         configuration.unmodifiable();
 
         Collection<CamelContext> contexts = new ArrayList<>();
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelFactory.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelFactory.java
index 1abad3988c5..68861635040 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelFactory.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelFactory.java
@@ -23,13 +23,13 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Optional;
 
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.InjectionException;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.InjectionException;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Produces;
+import jakarta.enterprise.inject.spi.InjectionPoint;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ConsumerTemplate;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelInjector.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelInjector.java
index c6f741ad664..a9c610d41bc 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelInjector.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelInjector.java
@@ -19,8 +19,8 @@ package org.apache.camel.cdi;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.BeanManager;
 
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.Injector;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventComponent.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventComponent.java
index ef2cf111b59..0a182513322 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventComponent.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventComponent.java
@@ -18,8 +18,8 @@ package org.apache.camel.cdi;
 
 import java.util.Map;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.support.DefaultComponent;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventConsumer.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventConsumer.java
index 82f83743675..c3746008ca8 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventConsumer.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventConsumer.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi;
 
-import javax.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.Vetoed;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.ExtendedExchange;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java
index ef5d5c5e3a3..f44648584b9 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java
@@ -26,13 +26,13 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Stream;
 
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.util.TypeLiteral;
-import javax.inject.Inject;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.util.TypeLiteral;
+import jakarta.inject.Inject;
 
 import org.apache.camel.Consumer;
 import org.apache.camel.Endpoint;
@@ -89,7 +89,7 @@ import static java.util.stream.Collectors.joining;
  * </code>
  * </pre>
  */
-@javax.enterprise.inject.Vetoed
+@jakarta.enterprise.inject.Vetoed
 public final class CdiEventEndpoint<T> extends DefaultEndpoint {
 
     private final List<CdiEventConsumer<T>> consumers = new ArrayList<>();
@@ -156,7 +156,8 @@ public final class CdiEventEndpoint<T> extends DefaultEndpoint {
             }
         }
 
-        InjectionTarget<AnyEvent> target = manager.createInjectionTarget(manager.createAnnotatedType(AnyEvent.class));
+        InjectionTarget<AnyEvent> target = manager.getInjectionTargetFactory(
+                manager.createAnnotatedType(AnyEvent.class)).createInjectionTarget(null);
         CreationalContext<AnyEvent> ctx = manager.createCreationalContext(null);
         AnyEvent instance = target.produce(ctx);
         target.inject(instance, ctx);
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java
index f3d7dfe62b0..56d90ba760e 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java
@@ -22,8 +22,8 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.BeanManager;
 
 import org.apache.camel.spi.CamelEvent;
 import org.apache.camel.spi.CamelEvent.RouteEvent;
@@ -56,9 +56,9 @@ final class CdiEventNotifier extends EventNotifierSupport {
             List<Annotation> annotations = new ArrayList<>();
             Collections.addAll(annotations, qualifiers);
             annotations.add(NamedLiteral.of(id));
-            manager.fireEvent(event, annotations.toArray(new Annotation[0]));
+            manager.getEvent().select(annotations.toArray(new Annotation[0])).fire(event);
         } else {
-            manager.fireEvent(event, qualifiers);
+            manager.getEvent().select(qualifiers).fire(event);
         }
     }
 
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventProducer.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventProducer.java
index 6c5ea8b31ec..00d1919f60f 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventProducer.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventProducer.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi;
 
-import javax.enterprise.event.Event;
-import javax.enterprise.inject.Vetoed;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.inject.Vetoed;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.support.DefaultProducer;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiSpiHelper.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiSpiHelper.java
index 0ebaf867463..beb03b9a56c 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiSpiHelper.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiSpiHelper.java
@@ -34,17 +34,17 @@ import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Default;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMember;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.util.Nonbinding;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.AnnotatedConstructor;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedMember;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.util.Nonbinding;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.RuntimeCamelException;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateInjectionTarget.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateInjectionTarget.java
index bcd343a8b49..577d13f5b50 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateInjectionTarget.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateInjectionTarget.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.cdi;
 
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.Producer;
 
 abstract class DelegateInjectionTarget<T> extends DelegateProducer<T> implements InjectionTarget<T> {
 
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateProducer.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateProducer.java
index 2d8168c47eb..842e0fbdafe 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateProducer.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/DelegateProducer.java
@@ -18,9 +18,9 @@ package org.apache.camel.cdi;
 
 import java.util.Set;
 
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.Producer;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.Producer;
 
 abstract class DelegateProducer<T> implements Producer<T> {
 
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java
index 32a9e2bf5a3..19aaa08d0b1 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java
@@ -20,8 +20,8 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Qualifier;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ForwardingObserverMethod.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ForwardingObserverMethod.java
index 6767d7553b0..29f75e92688 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ForwardingObserverMethod.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ForwardingObserverMethod.java
@@ -20,10 +20,10 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.Set;
 
-import javax.enterprise.event.Reception;
-import javax.enterprise.event.TransactionPhase;
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.ObserverMethod;
+import jakarta.enterprise.event.Reception;
+import jakarta.enterprise.event.TransactionPhase;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.ObserverMethod;
 
 import org.apache.camel.CamelContext;
 
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ImportResource.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ImportResource.java
index 260df7b9456..430dc8a88a4 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ImportResource.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ImportResource.java
@@ -21,7 +21,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.inject.Default;
+import jakarta.enterprise.inject.Default;
 
 /**
  * Indicates one or more resources representing
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ListParameterizedType.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ListParameterizedType.java
index 08ead2c1be3..207c7c3ad15 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ListParameterizedType.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ListParameterizedType.java
@@ -20,7 +20,7 @@ import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.List;
 
-import javax.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.Vetoed;
 
 @Vetoed
 final class ListParameterizedType implements ParameterizedType {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/NamedLiteral.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/NamedLiteral.java
index 71a3d367c73..9ea781b7e13 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/NamedLiteral.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/NamedLiteral.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi;
 
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Named;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Named;
 
 @Vetoed
 final class NamedLiteral extends AnnotationLiteral<Named> implements Named {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Startup.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Startup.java
index 7c7564df17b..670be257359 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Startup.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Startup.java
@@ -21,8 +21,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Qualifier;
 
 /**
  * Can be replaced by an observer: {@code void onStart(@Observes @Initialized(ApplicationScoped) Object start)}.
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticAnnotated.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticAnnotated.java
index f7cf017a718..96c138ff37f 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticAnnotated.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticAnnotated.java
@@ -22,7 +22,7 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.Annotated;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.unmodifiableSet;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java
index c2839021d03..c43446f96d7 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java
@@ -21,15 +21,15 @@ import java.util.Set;
 import java.util.StringJoiner;
 import java.util.function.Function;
 
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.CreationException;
-import javax.enterprise.inject.InjectionException;
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.CreationException;
+import jakarta.enterprise.inject.InjectionException;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.PassivationCapable;
 
 import static org.apache.camel.cdi.CdiSpiHelper.createBeanId;
 
@@ -84,12 +84,7 @@ class SyntheticBean<T> extends SyntheticBeanAttributes<T> implements Bean<T>, Pa
         return Collections.emptySet();
     }
 
-    @Override
-    public boolean isNullable() {
-        return false;
-    }
-
-    @Override
+       @Override
     public String toString() {
         return toString.apply(this);
     }
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBeanAttributes.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBeanAttributes.java
index 7eae85aaa41..7a1d3581915 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBeanAttributes.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBeanAttributes.java
@@ -20,10 +20,10 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.Set;
 
-import javax.enterprise.context.Dependent;
-import javax.enterprise.inject.Vetoed;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.Named;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Vetoed;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.inject.Named;
 
 import static java.util.Collections.emptySet;
 import static java.util.stream.Collectors.toSet;
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticInjectionTarget.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticInjectionTarget.java
index 852c134c35d..96a945b7f2c 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticInjectionTarget.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticInjectionTarget.java
@@ -21,9 +21,9 @@ import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InjectionTarget;
 
 @Vetoed
 class SyntheticInjectionTarget<T> implements InjectionTarget<T> {
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Uri.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Uri.java
index 9cb5494b54a..fc563031dbd 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Uri.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Uri.java
@@ -21,9 +21,9 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.AnnotationLiteral;
-import javax.enterprise.util.Nonbinding;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.util.Nonbinding;
+import jakarta.inject.Qualifier;
 
 /**
  * A CDI qualifier to define the <a href="http://camel.apache.org/uris.html">Camel URI</a> associated to the annotated
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CamelContextAwareBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CamelContextAwareBean.java
index fe04274d566..f2654165e56 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CamelContextAwareBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CamelContextAwareBean.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.CamelContextAware;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CamelContextProducerMethod.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CamelContextProducerMethod.java
index 3d7917573f1..ae0be596029 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CamelContextProducerMethod.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CamelContextProducerMethod.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Disposes;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Disposes;
+import jakarta.enterprise.inject.Produces;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.impl.DefaultCamelContext;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ConsumeMethodBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ConsumeMethodBean.java
index d690134560f..199b1e3f384 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ConsumeMethodBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ConsumeMethodBean.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.apache.camel.Body;
 import org.apache.camel.Consume;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CustomLifecycleCamelContext.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CustomLifecycleCamelContext.java
index 9d54efe463e..1c9af419879 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CustomLifecycleCamelContext.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CustomLifecycleCamelContext.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.cdi.CdiCamelContext;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CustomPropertiesCamelContext.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CustomPropertiesCamelContext.java
index 66040ecfa6b..ccdcbbf0fe6 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CustomPropertiesCamelContext.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/CustomPropertiesCamelContext.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.apache.camel.impl.DefaultCamelContext;
 
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/DefaultCamelContextBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/DefaultCamelContextBean.java
index 8beeb10b162..ddc56ad71ad 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/DefaultCamelContextBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/DefaultCamelContextBean.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
 
 import org.apache.camel.impl.DefaultCamelContext;
 
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventConsumingRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventConsumingRoute.java
index 288ab88ea89..c48b3d26e29 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventConsumingRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventConsumingRoute.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.CdiEventEndpoint;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventConsumingRouteCdi10.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventConsumingRouteCdi10.java
index d8a4eb3f971..b08a02db8ff 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventConsumingRouteCdi10.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventConsumingRouteCdi10.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.CdiEventEndpoint;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRoute.java
index 48d77a43f2e..1a5a5f15b26 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRoute.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.CdiEventEndpoint;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRouteCdi10.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRouteCdi10.java
index 0c21c26473d..85c4ea8ced5 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRouteCdi10.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/EventProducingRouteCdi10.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.CdiEventEndpoint;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextBean.java
index 876059c12d4..0fee018e5cb 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextBean.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.apache.camel.impl.DefaultCamelContext;
 
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextConvertingRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextConvertingRoute.java
index be2e72f54ba..e71a9b2e033 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextConvertingRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextConvertingRoute.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.pojo.TypeConverterOutput;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEndpointInjectRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEndpointInjectRoute.java
index 6d85c68ba39..e0f54db7d22 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEndpointInjectRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEndpointInjectRoute.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEventConsumingRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEventConsumingRoute.java
index abafe7aea08..ccc8d140e51 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEventConsumingRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEventConsumingRoute.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.CdiEventEndpoint;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEventProducingRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEventProducingRoute.java
index 15a4a0986e5..981debf4c02 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEventProducingRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextEventProducingRoute.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.CdiEventEndpoint;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextRoute.java
index f2f9eec40e9..26f2a3395fa 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstCamelContextRoute.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.apache.camel.builder.RouteBuilder;
 
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstNamedCamelContextBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstNamedCamelContextBean.java
index 9f1e9a97671..cbd59f35425 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstNamedCamelContextBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstNamedCamelContextBean.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
 
 import org.apache.camel.impl.DefaultCamelContext;
 
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstNamedCamelContextRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstNamedCamelContextRoute.java
index 9f105bb576f..9faccefbede 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstNamedCamelContextRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/FirstNamedCamelContextRoute.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.apache.camel.builder.RouteBuilder;
 
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/InjectedEndpointRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/InjectedEndpointRoute.java
index e0ed2268b22..5162f41ec23 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/InjectedEndpointRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/InjectedEndpointRoute.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ManualStartupCamelContext.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ManualStartupCamelContext.java
index 010e7700ed0..9b76e3da2ea 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ManualStartupCamelContext.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/ManualStartupCamelContext.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.apache.camel.impl.DefaultCamelContext;
 
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/MockAnnotationRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/MockAnnotationRoute.java
index b9d3ac4e07f..0417790fc7f 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/MockAnnotationRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/MockAnnotationRoute.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/NamedCamelBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/NamedCamelBean.java
index f86bb407b48..ef04e1695bb 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/NamedCamelBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/NamedCamelBean.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 @Named("beanName")
 public class NamedCamelBean {
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/RecipientListMethodBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/RecipientListMethodBean.java
index 48ebacadf7c..1c58c1cefde 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/RecipientListMethodBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/RecipientListMethodBean.java
@@ -19,7 +19,7 @@ package org.apache.camel.cdi.bean;
 import java.util.Arrays;
 import java.util.List;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.apache.camel.Consume;
 import org.apache.camel.RecipientList;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextBean.java
index e7299a77b14..39372fabfc1 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextBean.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
 
 import org.apache.camel.impl.DefaultCamelContext;
 
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextConvertingRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextConvertingRoute.java
index ec6b8eeeac2..77edaa6df96 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextConvertingRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextConvertingRoute.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.pojo.TypeConverterOutput;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEventConsumingRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEventConsumingRoute.java
index 6875e97cfb3..e4d6041a58d 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEventConsumingRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEventConsumingRoute.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.CdiEventEndpoint;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEventProducingRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEventProducingRoute.java
index cb62b02fb42..140841e5872 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEventProducingRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondCamelContextEventProducingRoute.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.CdiEventEndpoint;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondNamedCamelContextBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondNamedCamelContextBean.java
index 960853aac73..0a3802c71cf 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondNamedCamelContextBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondNamedCamelContextBean.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
 
 import org.apache.camel.impl.DefaultCamelContext;
 
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondNamedCamelContextRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondNamedCamelContextRoute.java
index 6bb964280e1..b5fa0c6aa7a 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondNamedCamelContextRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SecondNamedCamelContextRoute.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Named;
 
 import org.apache.camel.builder.RouteBuilder;
 
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SimpleCamelRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SimpleCamelRoute.java
index 15beaf48e8f..81b15fcd746 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SimpleCamelRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/SimpleCamelRoute.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/UriEndpointRoute.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/UriEndpointRoute.java
index 3bc2b5c0320..eb3c5618af8 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/UriEndpointRoute.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/bean/UriEndpointRoute.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.bean;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.apache.camel.builder.RouteBuilder;
 
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/converter/InjectedTestTypeConverter.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/converter/InjectedTestTypeConverter.java
index 8c0b348ea69..a4fd1f1176a 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/converter/InjectedTestTypeConverter.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/converter/InjectedTestTypeConverter.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.converter;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Converter;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/BarQualifier.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/BarQualifier.java
index ff35f1864ca..7dd5cddd6a5 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/BarQualifier.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/BarQualifier.java
@@ -20,8 +20,8 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Qualifier;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/FooQualifier.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/FooQualifier.java
index 5df8a8065b0..d7a41d679ac 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/FooQualifier.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/FooQualifier.java
@@ -20,8 +20,8 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.enterprise.util.AnnotationLiteral;
-import javax.inject.Qualifier;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.inject.Qualifier;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/Manual.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/Manual.java
index adf176fbbe0..e662165c178 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/Manual.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/qualifier/Manual.java
@@ -20,7 +20,7 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/routetemplate/MyRouteCreatorBean.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/routetemplate/MyRouteCreatorBean.java
index 720b4fe70c2..c1490bb5b10 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/routetemplate/MyRouteCreatorBean.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/routetemplate/MyRouteCreatorBean.java
@@ -19,9 +19,9 @@ package org.apache.camel.cdi.routetemplate;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.spi.CamelEvent;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/routetemplate/RouteTemplateTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/routetemplate/RouteTemplateTest.java
index c93013cdc35..869942d3141 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/routetemplate/RouteTemplateTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/routetemplate/RouteTemplateTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.routetemplate;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/templatedroute/TemplatedRouteTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/templatedroute/TemplatedRouteTest.java
index b5e6b16b821..ccd77b8bea4 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/templatedroute/TemplatedRouteTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/templatedroute/TemplatedRouteTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.templatedroute;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedMockEndpointProducerTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedMockEndpointProducerTest.java
index c99f7d65950..f342147839c 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedMockEndpointProducerTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedMockEndpointProducerTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedRouteTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedRouteTest.java
index 7514d092ecf..7cbe6756f38 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedRouteTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/AdvisedRouteTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.cdi.test;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.AdviceWith;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/BeanInjectTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/BeanInjectTest.java
index 2fc33d9d7bd..efe65d06dbb 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/BeanInjectTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/BeanInjectTest.java
@@ -18,10 +18,10 @@ package org.apache.camel.cdi.test;
 
 import java.util.Properties;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.camel.cdi.CdiCamelExtension;
 import org.apache.camel.cdi.bean.BeanInjectBean;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/Camel9973Test.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/Camel9973Test.java
index 656f6ea5100..74e807e4744 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/Camel9973Test.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/Camel9973Test.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.cdi.test;
 
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextAwareTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextAwareTest.java
index 32582888336..9d907f877ea 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextAwareTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextAwareTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.test;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.cdi.CdiCamelExtension;
 import org.apache.camel.cdi.bean.CamelContextAwareBean;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextProducerFieldTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextProducerFieldTest.java
index 4d9c210d10c..0a55ca67cab 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextProducerFieldTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextProducerFieldTest.java
@@ -18,10 +18,10 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextProducerMethodTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextProducerMethodTest.java
index 311d67c5b46..8bd4abf8e54 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextProducerMethodTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelContextProducerMethodTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventEndpointTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventEndpointTest.java
index b4ed2ad87b1..a87d494df09 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventEndpointTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventEndpointTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.EventObject;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
index 2da3f638f5b..b4fc6d4a1e7 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelEventNotifierTest.java
@@ -20,10 +20,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelRouteEventNotifierTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelRouteEventNotifierTest.java
index e25e9ef38ad..30bd2d057d3 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelRouteEventNotifierTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CamelRouteEventNotifierTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.cdi.test;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Named;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CdiCamelConfigurationTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CdiCamelConfigurationTest.java
index c7c343858e8..521c561f87c 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CdiCamelConfigurationTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CdiCamelConfigurationTest.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.test;
 
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.cdi.CdiCamelConfiguration;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ConsumeMethodTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ConsumeMethodTest.java
index e8186e84195..e876b298f41 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ConsumeMethodTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ConsumeMethodTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ConsumerTemplateTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ConsumerTemplateTest.java
index 3b1337a75e5..2cc802237f2 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ConsumerTemplateTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ConsumerTemplateTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ConsumerTemplate;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ContextComponentTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ContextComponentTest.java
index 4036093b6d1..43f055e4ef5 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ContextComponentTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ContextComponentTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CustomCamelContextTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CustomCamelContextTest.java
index 74c3975dd03..ce3621179cb 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CustomCamelContextTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/CustomCamelContextTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DefaultCamelContextTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DefaultCamelContextTest.java
index c6613b74afa..b4d1d4e64a3 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DefaultCamelContextTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DefaultCamelContextTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DefaultProducerTemplateTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DefaultProducerTemplateTest.java
index fa0844ef492..efea67bc0ac 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DefaultProducerTemplateTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DefaultProducerTemplateTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DeploymentDescriptorTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DeploymentDescriptorTest.java
index 3931e8ddd54..2dd5bd3ea43 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DeploymentDescriptorTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/DeploymentDescriptorTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EndpointInjectTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EndpointInjectTest.java
index 6b98fe31301..b5b5ce913ca 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EndpointInjectTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EndpointInjectTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventComponentTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventComponentTest.java
index 3e2070f15d3..c292c4a4958 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventComponentTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventComponentTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.cdi.test;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventEndpointCdi12Test.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventEndpointCdi12Test.java
index e30914bddab..c3dfb84fc2b 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventEndpointCdi12Test.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventEndpointCdi12Test.java
@@ -20,12 +20,12 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Default;
-import javax.enterprise.util.TypeLiteral;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Default;
+import jakarta.enterprise.util.TypeLiteral;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventEndpointTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventEndpointTest.java
index 54f891475e0..72a1c07688f 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventEndpointTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/EventEndpointTest.java
@@ -20,11 +20,11 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Default;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.Default;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/InjectedEndpointTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/InjectedEndpointTest.java
index 821ce5f3f02..bba3351f969 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/InjectedEndpointTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/InjectedEndpointTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/InjectedTypeConverterTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/InjectedTypeConverterTest.java
index 1cce06ed6f0..83bbdda331e 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/InjectedTypeConverterTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/InjectedTypeConverterTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.cdi.test;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Named;
 
 import org.apache.camel.NoTypeConversionAvailableException;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ManualCamelContextTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ManualCamelContextTest.java
index 43595619f11..09b63fb0bc9 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ManualCamelContextTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ManualCamelContextTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/MockEndpointTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/MockEndpointTest.java
index 93ba06a7a9f..0a8ac65404f 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/MockEndpointTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/MockEndpointTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NamedCamelContextTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NamedCamelContextTest.java
index a8a5545149f..90cc36fec54 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NamedCamelContextTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NamedCamelContextTest.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.cdi.test;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Named;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NoCamelContextTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NoCamelContextTest.java
index 2e14383b3e7..0ace791807a 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NoCamelContextTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NoCamelContextTest.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.cdi.test;
 
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NoTCCLSetTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NoTCCLSetTest.java
index 063cd1a9fd4..da993b6da35 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NoTCCLSetTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/NoTCCLSetTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.cdi.test;
 
 import java.util.Set;
 
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ExtendedCamelContext;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ProgrammaticLookupTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ProgrammaticLookupTest.java
index a9fe9866fbb..38704fdbcf0 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ProgrammaticLookupTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/ProgrammaticLookupTest.java
@@ -18,9 +18,9 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Instance;
-import javax.inject.Inject;
+import jakarta.enterprise.inject.Any;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertiesLocationTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertiesLocationTest.java
index 32bcfd038aa..9db8ea6abd4 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertiesLocationTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertiesLocationTest.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.cdi.test;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Named;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertyEndpointTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertyEndpointTest.java
index 7bac2e55c07..2e0e3109d2c 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertyEndpointTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertyEndpointTest.java
@@ -19,10 +19,10 @@ package org.apache.camel.cdi.test;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertyInjectTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertyInjectTest.java
index a41c79b2c20..38eb7e510b9 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertyInjectTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/PropertyInjectTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.cdi.test;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Named;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/QualifiedCamelContextTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/QualifiedCamelContextTest.java
index bf655109611..75674d6a818 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/QualifiedCamelContextTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/QualifiedCamelContextTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/RawEventEndpointCdi12Test.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/RawEventEndpointCdi12Test.java
index 0ffdbb55ba5..3762f56df18 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/RawEventEndpointCdi12Test.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/RawEventEndpointCdi12Test.java
@@ -18,10 +18,10 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.event.Event;
-import javax.enterprise.event.Observes;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/RecipientListMethodTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/RecipientListMethodTest.java
index ddd1d9d24f4..1212f77354f 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/RecipientListMethodTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/RecipientListMethodTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UndefinedPropertyTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UndefinedPropertyTest.java
index eb15a250557..6c05fc2621e 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UndefinedPropertyTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UndefinedPropertyTest.java
@@ -18,9 +18,9 @@ package org.apache.camel.cdi.test;
 
 import java.util.Properties;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
-import javax.inject.Named;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Named;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextBeanTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextBeanTest.java
index d71c61ed3d8..f5b42d31c43 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextBeanTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextBeanTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextProducerFieldTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextProducerFieldTest.java
index febdc78e2b9..5306ca2e91f 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextProducerFieldTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextProducerFieldTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextProducerMethodTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextProducerMethodTest.java
index 637bb583611..f36dc1cfb80 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextProducerMethodTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UnstoppedCamelContextProducerMethodTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriEndpointTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriEndpointTest.java
index 3ff1ddd021a..0333ff03005 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriEndpointTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriEndpointTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.cdi.CdiCamelExtension;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriQualifierWithContextTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriQualifierWithContextTest.java
index f81d2355005..8fff717ad61 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriQualifierWithContextTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriQualifierWithContextTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.cdi.test;
 
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.ProducerTemplate;
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriWithWrongContextTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriWithWrongContextTest.java
index 76e0a87fbd4..47e9b227fb2 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriWithWrongContextTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/test/UriWithWrongContextTest.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.cdi.test;
 
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMComponent.java b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMComponent.java
index 55cd3239bc3..f13cdb8728f 100644
--- a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMComponent.java
+++ b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMComponent.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.cm;
 import java.util.Map;
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
diff --git a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMConfiguration.java b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMConfiguration.java
index d5091845636..576ec928df1 100644
--- a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMConfiguration.java
+++ b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMConfiguration.java
@@ -16,10 +16,10 @@
  */
 package org.apache.camel.component.cm;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
diff --git a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMProducer.java b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMProducer.java
index f6b4684ce02..9a28f0572cd 100644
--- a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMProducer.java
+++ b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMProducer.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.cm;
 
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validator;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.InvalidPayloadRuntimeException;
diff --git a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/client/SMSMessage.java b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/client/SMSMessage.java
index dfbda1f6b94..2918918dc9e 100644
--- a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/client/SMSMessage.java
+++ b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/client/SMSMessage.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.component.cm.client;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 
 import org.apache.camel.component.cm.validation.constraints.E164;
 
diff --git a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/validation/constraints/E164.java b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/validation/constraints/E164.java
index 79e3124228e..2eaa6aca77c 100644
--- a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/validation/constraints/E164.java
+++ b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/validation/constraints/E164.java
@@ -22,8 +22,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 @Target({
         ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER,
diff --git a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/validation/constraints/E164Validator.java b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/validation/constraints/E164Validator.java
index cdc4293c60d..695ea5a2791 100644
--- a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/validation/constraints/E164Validator.java
+++ b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/validation/constraints/E164Validator.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.component.cm.validation.constraints;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 
 import com.google.i18n.phonenumbers.NumberParseException;
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
diff --git a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMConfigurationTest.java b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMConfigurationTest.java
index 2b0082887dc..a85dfb72dd5 100644
--- a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMConfigurationTest.java
+++ b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMConfigurationTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.cm.test;
 import java.util.Set;
 import java.util.UUID;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validator;
 
 import org.apache.camel.component.cm.CMConfiguration;
 import org.apache.camel.test.spring.junit5.CamelSpringTest;
diff --git a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/SMSMessageTest.java b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/SMSMessageTest.java
index af880c19340..f44173f3e5a 100644
--- a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/SMSMessageTest.java
+++ b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/SMSMessageTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.cm.test;
 
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validator;
 
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
 import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat;
diff --git a/components/camel-cmis/pom.xml b/components/camel-cmis/pom.xml
index 71cbeee5457..5d2b2883274 100644
--- a/components/camel-cmis/pom.xml
+++ b/components/camel-cmis/pom.xml
@@ -32,9 +32,6 @@
     <description>Camel CMIS which is based on Apache Chemistry support</description>
 
     <properties>
-        <camel.osgi.import>
-            !org.apache.chemistry.opencmis.client.runtime,*
-        </camel.osgi.import>
     </properties>
 
     <dependencies>
diff --git a/components/camel-cometd/pom.xml b/components/camel-cometd/pom.xml
index c9875400afc..7e940903991 100644
--- a/components/camel-cometd/pom.xml
+++ b/components/camel-cometd/pom.xml
@@ -32,11 +32,6 @@
     <description>Camel Cometd support based on Jetty</description>
 
     <properties>
-        <camel.osgi.import.pkg>
-            org.eclipse.jetty.*;version="[9.4,10)",
-            ${camel.osgi.import.defaults},
-            *
-        </camel.osgi.import.pkg>
     </properties>
 
     <dependencies>
@@ -66,17 +61,12 @@
         </dependency>
         <dependency>
             <groupId>org.cometd.java</groupId>
-            <artifactId>cometd-java-server</artifactId>
-            <version>${cometd-java-server}</version>
+            <artifactId>cometd-java-server-websocket-jetty</artifactId>
+            <version>${cometd-java-server-version}</version>
         </dependency>
         <dependency>
-            <groupId>org.cometd.java</groupId>
-            <artifactId>bayeux-api</artifactId>
-            <version>${cometd-java-server}</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
 
         <!-- Test Dependencies -->
diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
index e256d623515..12f5338d5d3 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
@@ -23,7 +23,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.DispatcherType;
+import jakarta.servlet.DispatcherType;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.SSLContextParametersAware;
diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java
index 68bde87e7aa..9be07be9efb 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java
@@ -108,7 +108,7 @@ public class CometdProducer extends DefaultProducer implements CometdProducerCon
                     logDelivery(exchange, channel);
                     ServerMessage.Mutable mutable = binding.createCometdMessage(channel, serverSession,
                             exchange.getIn());
-                    channel.publish(serverSession, mutable);
+                    channel.publish(serverSession, mutable, new org.cometd.bayeux.Promise<>() {});
                 }
             } finally {
                 if (disconnectLocalSession && serverSession.isLocalSession()) {
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveAuthenticatedManualTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveAuthenticatedManualTest.java
index 92d84a48759..ac2ad917e34 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveAuthenticatedManualTest.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveAuthenticatedManualTest.java
@@ -83,7 +83,7 @@ public class CometdProducerConsumerInteractiveAuthenticatedManualTest {
      * Custom SecurityPolicy, see http://cometd.org/documentation/howtos/authentication for details
      */
     public static final class BayeuxAuthenticator extends DefaultSecurityPolicy
-            implements BayeuxServer.Extension, ServerSession.RemoveListener {
+            implements BayeuxServer.Extension, ServerSession.RemovedListener {
 
         private String user = "changeit";
         private String pwd = "changeit";
@@ -143,7 +143,7 @@ public class CometdProducerConsumerInteractiveAuthenticatedManualTest {
         }
 
         @Override
-        public void removed(ServerSession session, boolean timeout) {
+        public void removed(ServerSession session, ServerMessage message, boolean timeout) {
             // Remove authentication data
         }
 
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveExtensionManualTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveExtensionManualTest.java
index 0cf0082607d..0cf1e1b3cff 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveExtensionManualTest.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInteractiveExtensionManualTest.java
@@ -73,12 +73,12 @@ public class CometdProducerConsumerInteractiveExtensionManualTest {
         };
     }
 
-    public static final class Censor implements BayeuxServer.Extension, ServerSession.RemoveListener {
+    public static final class Censor implements BayeuxServer.Extension, ServerSession.RemovedListener {
 
         private HashSet<String> forbidden = new HashSet<>(Arrays.asList("one", "two"));
 
         @Override
-        public void removed(ServerSession session, boolean timeout) {
+        public void removed(ServerSession session, ServerMessage message, boolean timeout) {
             // called on remove of client
         }
 
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceCallWithRegistrationIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceCallWithRegistrationIT.java
index 07c0c3e0b7a..1e371c7cc1d 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceCallWithRegistrationIT.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceCallWithRegistrationIT.java
@@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.consul.ConsulTestSupport;
 import org.apache.camel.impl.cloud.ServiceRegistrationRoutePolicy;
 import org.junit.jupiter.api.Test;
-import org.springframework.util.SocketUtils;
+import org.apache.camel.test.AvailablePortFinder;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -63,7 +63,7 @@ public class ConsulServiceCallWithRegistrationIT extends ConsulTestSupport {
 
     @Test
     public void testServiceCallSuccess() throws Exception {
-        final int port = SocketUtils.findAvailableTcpPort();
+        final int port = AvailablePortFinder.getNextAvailable();
         final String serviceId = UUID.randomUUID().toString();
         final String serviceName = UUID.randomUUID().toString();
 
@@ -91,7 +91,7 @@ public class ConsulServiceCallWithRegistrationIT extends ConsulTestSupport {
 
     @Test
     public void testServiceCallFailure() throws Exception {
-        final int port = SocketUtils.findAvailableTcpPort();
+        final int port = AvailablePortFinder.getNextAvailable();
         final String serviceId = UUID.randomUUID().toString();
         final String serviceName = UUID.randomUUID().toString();
 
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryIT.java
index 2f20362ff31..793cbced40d 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryIT.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryIT.java
@@ -30,7 +30,7 @@ import org.apache.camel.component.consul.ConsulConfiguration;
 import org.apache.camel.component.consul.ConsulTestSupport;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.springframework.util.SocketUtils;
+import org.apache.camel.test.AvailablePortFinder;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -53,7 +53,7 @@ public class ConsulServiceDiscoveryIT extends ConsulTestSupport {
 
         for (int i = 0; i < 6; i++) {
             final boolean healty = ThreadLocalRandom.current().nextBoolean();
-            final int port = SocketUtils.findAvailableTcpPort();
+            final int port = AvailablePortFinder.getNextAvailable();
 
             Registration.RegCheck c = ImmutableRegCheck.builder().ttl("1m").status(healty ? "passing" : "critical").build();
 
diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistrationTestBase.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistrationTestBase.java
index 672a082508d..6ab9cebace7 100644
--- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistrationTestBase.java
+++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistrationTestBase.java
@@ -29,7 +29,7 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.cloud.ServiceDefinition;
 import org.apache.camel.component.consul.ConsulTestSupport;
 import org.junit.jupiter.api.Test;
-import org.springframework.util.SocketUtils;
+import org.apache.camel.test.AvailablePortFinder;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -38,7 +38,7 @@ public abstract class ConsulServiceRegistrationTestBase extends ConsulTestSuppor
     protected static final String SERVICE_ID = UUID.randomUUID().toString();
     protected static final String SERVICE_NAME = "my-service";
     protected static final String SERVICE_HOST = "localhost";
-    protected static final int SERVICE_PORT = SocketUtils.findAvailableTcpPort();
+    protected static final int SERVICE_PORT = AvailablePortFinder.getNextAvailable();
 
     protected Map<String, String> getMetadata() {
         return Collections.emptyMap();
diff --git a/components/camel-cxf/camel-cxf-common/pom.xml b/components/camel-cxf/camel-cxf-common/pom.xml
index eca739653ff..eb27a31a143 100644
--- a/components/camel-cxf/camel-cxf-common/pom.xml
+++ b/components/camel-cxf/camel-cxf-common/pom.xml
@@ -33,38 +33,6 @@
     <description>Camel CXF Common</description>
 
     <properties>
-        <camel.osgi.import.defaults />
-        <camel.osgi.import>
-            !org.springframework.boot.*,
-            !org.springframework.context.annotation.*;resolution:=optional,
-            !org.apache.camel.component.cxf,
-            !org.apache.camel.component.cxf.blueprint,
-            !org.apache.camel.component.cxf.converter,
-            !org.apache.camel.component.cxf.feature,
-            !org.apache.camel.component.cxf.interceptors,
-            !org.apache.camel.component.cxf.jaxrs,
-            !org.apache.camel.component.cxf.spring,
-            !org.apache.camel.component.cxf.util,
-            !org.apache.camel.blueprint,
-            !org.apache.camel.test,
-            javax.xml.soap*;version="[1.3,2)";resolution:=optional,
-            javax.xml.stream*;version="[0.0,2)";resolution:=optional,
-            org.apache.camel.*;${camel.osgi.import.camel.version},
-            org.apache.camel.component.cxf.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
-            org.apache.camel.component.cxf.jaxrs.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
-            org.apache.cxf.*;version="${cxf-version-range}",
-            ${camel.osgi.import.defaults},
-            ${camel.osgi.import.additional},
-            org.osgi.service.blueprint;resolution:=optional,
-            org.osgi.service.blueprint.container;resolution:=optional,
-            org.osgi.service.blueprint.reflect;resolution:=optional,
-            org.apache.aries.blueprint;version="[1.0,2.0)";resolution:=optional,
-            org.apache.aries.blueprint.reflect;version="[1.0,2.0)";resolution:=optional,
-            org.apache.aries.blueprint.mutable;version="[1.0,2.0)";resolution:=optional,
-            org.apache.camel.blueprint;resolution:=optional,
-            *
-        </camel.osgi.import>
-        <camel.osgi.failok>true</camel.osgi.failok>
 
         <camel-prepare-component>false</camel-prepare-component>
 
@@ -94,9 +62,14 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax-servlet-api-version}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta-servlet-api-version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.xml.soap</groupId>
+            <artifactId>jakarta.xml.soap-api</artifactId>
         </dependency>
 
         <dependency>
diff --git a/components/camel-cxf/camel-cxf-common/src/generated/java/org/apache/camel/component/cxf/converter/CxfConverterLoader.java b/components/camel-cxf/camel-cxf-common/src/generated/java/org/apache/camel/component/cxf/converter/CxfConverterLoader.java
index 993c8b54973..791c8a542e1 100644
--- a/components/camel-cxf/camel-cxf-common/src/generated/java/org/apache/camel/component/cxf/converter/CxfConverterLoader.java
+++ b/components/camel-cxf/camel-cxf-common/src/generated/java/org/apache/camel/component/cxf/converter/CxfConverterLoader.java
@@ -42,12 +42,12 @@ public final class CxfConverterLoader implements TypeConverterLoader, CamelConte
     }
 
     private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, java.io.InputStream.class, javax.xml.soap.SOAPMessage.class, false,
-            (type, exchange, value) -> org.apache.camel.component.cxf.converter.CxfConverter.soapMessageToInputStream((javax.xml.soap.SOAPMessage) value, exchange));
+        addTypeConverter(registry, java.io.InputStream.class, jakarta.xml.soap.SOAPMessage.class, false,
+            (type, exchange, value) -> org.apache.camel.component.cxf.converter.CxfConverter.soapMessageToInputStream((jakarta.xml.soap.SOAPMessage) value, exchange));
         addTypeConverter(registry, java.lang.Object[].class, java.lang.Object.class, false,
             (type, exchange, value) -> org.apache.camel.component.cxf.converter.CxfConverter.toArray(value));
-        addTypeConverter(registry, java.lang.String.class, javax.xml.soap.SOAPMessage.class, false,
-            (type, exchange, value) -> org.apache.camel.component.cxf.converter.CxfConverter.soapMessageToString((javax.xml.soap.SOAPMessage) value, exchange));
+        addTypeConverter(registry, java.lang.String.class, jakarta.xml.soap.SOAPMessage.class, false,
+            (type, exchange, value) -> org.apache.camel.component.cxf.converter.CxfConverter.soapMessageToString((jakarta.xml.soap.SOAPMessage) value, exchange));
         addTypeConverter(registry, javax.xml.namespace.QName.class, java.lang.String.class, false,
             (type, exchange, value) -> org.apache.camel.component.cxf.converter.CxfConverter.toQName((java.lang.String) value));
         addTypeConverter(registry, org.apache.camel.component.cxf.common.DataFormat.class, java.lang.String.class, false,
diff --git a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/CxfBinding.java b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/CxfBinding.java
index 4a3f610757f..001cedbcf6d 100644
--- a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/CxfBinding.java
+++ b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/CxfBinding.java
@@ -119,7 +119,7 @@ public interface CxfBinding {
 
     /**
      * <p>
-     * Extract the message headers which key are start from javax.xml.ws* from the CXF exchange's inMessage, and put
+     * Extract the message headers which key are start from jakarta.xml.ws* from the CXF exchange's inMessage, and put
      * these headers into the context
      * </p>
      * 
@@ -131,7 +131,7 @@ public interface CxfBinding {
 
     /**
      * <p>
-     * Copy the javax.xml.ws* headers into cxfExchange's outMessage, if the cxfExchange has no outMessage, skip this
+     * Copy the jakarta.xml.ws* headers into cxfExchange's outMessage, if the cxfExchange has no outMessage, skip this
      * copy
      * </p>
      * 
diff --git a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/message/CxfConstants.java b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/message/CxfConstants.java
index 31591ba8b33..f7210e2ce15 100644
--- a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/message/CxfConstants.java
+++ b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/common/message/CxfConstants.java
@@ -99,9 +99,9 @@ public final class CxfConstants {
     public static final String CAMEL_CXF_ATTACHMENTS = "CamelAttachments";
     public static final String CAMEL_CXF_RS_THROW_EXCEPTION_ON_FAILURE = "CamelCxfRsThrowExceptionOnFailure";
 
-    public static final String WSA_HEADERS_INBOUND = "javax.xml.ws.addressing.context.inbound";
+    public static final String WSA_HEADERS_INBOUND = "jakarta.xml.ws.addressing.context.inbound";
 
-    public static final String WSA_HEADERS_OUTBOUND = "javax.xml.ws.addressing.context.outbound";
+    public static final String WSA_HEADERS_OUTBOUND = "jakarta.xml.ws.addressing.context.outbound";
 
     public static final String CAMEL_CXF_PROTOCOL_HEADERS_MERGED = "CamelCxfProtocolHeadersMerged";
 
diff --git a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
index db5dba3727a..3944bfeabb1 100644
--- a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
+++ b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
@@ -22,8 +22,8 @@ import java.io.InputStream;
 import java.util.Collection;
 
 import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.SOAPException;
+import jakarta.xml.soap.SOAPMessage;
 
 import org.apache.camel.Converter;
 import org.apache.camel.Exchange;
diff --git a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/util/ReaderInputStream.java b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/util/ReaderInputStream.java
index 4a6c334ae6b..a9df704eb62 100644
--- a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/util/ReaderInputStream.java
+++ b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/util/ReaderInputStream.java
@@ -60,7 +60,7 @@ import static org.apache.camel.util.BufferCaster.cast;
  * this class is an indication of a flaw in the design of the code. This class is typically used in situations where an
  * existing API only accepts an {@link InputStream}, but where the most natural way to produce the data is as a
  * character stream, i.e. by providing a {@link Reader} instance. An example of a situation where this problem may
- * appear is when implementing the {@link javax.activation.DataSource} interface from the Java Activation Framework.
+ * appear is when implementing the {@link jakarta.activation.DataSource} interface from the Java Activation Framework.
  * <p>
  * Given the fact that the {@link Reader} class doesn't provide any way to predict whether the next read operation will
  * block or not, it is not possible to provide a meaningful implementation of the {@link InputStream#available()}
diff --git a/components/camel-cxf/camel-cxf-rest/pom.xml b/components/camel-cxf/camel-cxf-rest/pom.xml
index 154af867c92..c2352b7b6f8 100644
--- a/components/camel-cxf/camel-cxf-rest/pom.xml
+++ b/components/camel-cxf/camel-cxf-rest/pom.xml
@@ -33,41 +33,6 @@
     <description>Camel CXF REST support</description>
 
     <properties>
-        <camel.osgi.import.defaults />
-        <camel.osgi.import>
-            !org.springframework.boot.*,
-            !org.springframework.context.annotation.*;resolution:=optional,
-            !org.apache.camel.component.cxf,
-            !org.apache.camel.component.cxf.blueprint,
-            !org.apache.camel.component.cxf.converter,
-            !org.apache.camel.component.cxf.feature,
-            !org.apache.camel.component.cxf.interceptors,
-            !org.apache.camel.component.cxf.jaxrs,
-            !org.apache.camel.component.cxf.spring,
-            !org.apache.camel.blueprint,
-            javax.activation.*;version="${javax-activation-version-range}",
-            javax.jws*;version="[0.0,3)";resolution:=optional,
-            javax.ws.rs*;version="[0.0,3)",
-            javax.xml.soap*;version="[1.3,2)";resolution:=optional,
-            javax.xml.stream*;version="[0.0,2)";resolution:=optional,
-            javax.xml.ws*;version="[0.0,3.0)";resolution:=optional,
-            org.apache.camel.*;${camel.osgi.import.camel.version},
-            org.apache.camel.component.cxf.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
-            org.apache.camel.component.cxf.jaxrs.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
-            org.apache.cxf.*;version="${cxf-version-range}",
-            ${camel.osgi.import.defaults},
-            ${camel.osgi.import.additional},
-            org.osgi.service.blueprint;resolution:=optional,
-            org.osgi.service.blueprint.container;resolution:=optional,
-            org.osgi.service.blueprint.reflect;resolution:=optional,
-            org.apache.aries.blueprint;version="[1.0,2.0)";resolution:=optional,
-            org.apache.aries.blueprint.reflect;version="[1.0,2.0)";resolution:=optional,
-            org.apache.aries.blueprint.mutable;version="[1.0,2.0)";resolution:=optional,
-            org.apache.camel.blueprint;resolution:=optional,
-            *
-        </camel.osgi.import>
-        <camel.osgi.private.pkg />
-        <camel.osgi.failok>true</camel.osgi.failok>
 
     </properties>
 
@@ -90,9 +55,9 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax-servlet-api-version}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta-servlet-api-version}</version>
         </dependency>
 
         <dependency>
diff --git a/components/camel-cxf/camel-cxf-rest/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfConverterLoader.java b/components/camel-cxf/camel-cxf-rest/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfConverterLoader.java
index a75262a6996..a55439fe762 100644
--- a/components/camel-cxf/camel-cxf-rest/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfConverterLoader.java
+++ b/components/camel-cxf/camel-cxf-rest/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfConverterLoader.java
@@ -42,14 +42,14 @@ public final class CxfConverterLoader implements TypeConverterLoader, CamelConte
     }
 
     private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, java.io.InputStream.class, javax.ws.rs.core.Response.class, false,
-            (type, exchange, value) -> org.apache.camel.component.cxf.jaxrs.CxfConverter.toInputStream((javax.ws.rs.core.Response) value, exchange));
-        addTypeConverter(registry, java.io.InputStream.class, javax.xml.soap.SOAPMessage.class, false,
-            (type, exchange, value) -> org.apache.camel.component.cxf.jaxrs.CxfConverter.soapMessageToInputStream((javax.xml.soap.SOAPMessage) value, exchange));
+        addTypeConverter(registry, java.io.InputStream.class, jakarta.ws.rs.core.Response.class, false,
+            (type, exchange, value) -> org.apache.camel.component.cxf.jaxrs.CxfConverter.toInputStream((jakarta.ws.rs.core.Response) value, exchange));
+        addTypeConverter(registry, java.io.InputStream.class, jakarta.xml.soap.SOAPMessage.class, false,
+            (type, exchange, value) -> org.apache.camel.component.cxf.jaxrs.CxfConverter.soapMessageToInputStream((jakarta.xml.soap.SOAPMessage) value, exchange));
         addTypeConverter(registry, java.lang.Object[].class, java.lang.Object.class, false,
             (type, exchange, value) -> org.apache.camel.component.cxf.jaxrs.CxfConverter.toArray(value));
-        addTypeConverter(registry, java.lang.String.class, javax.xml.soap.SOAPMessage.class, false,
-            (type, exchange, value) -> org.apache.camel.component.cxf.jaxrs.CxfConverter.soapMessageToString((javax.xml.soap.SOAPMessage) value, exchange));
+        addTypeConverter(registry, java.lang.String.class, jakarta.xml.soap.SOAPMessage.class, false,
+            (type, exchange, value) -> org.apache.camel.component.cxf.jaxrs.CxfConverter.soapMessageToString((jakarta.xml.soap.SOAPMessage) value, exchange));
         addTypeConverter(registry, javax.xml.namespace.QName.class, java.lang.String.class, false,
             (type, exchange, value) -> org.apache.camel.component.cxf.jaxrs.CxfConverter.toQName((java.lang.String) value));
         addTypeConverter(registry, org.apache.camel.component.cxf.common.DataFormat.class, java.lang.String.class, false,
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfConverter.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfConverter.java
index 6bc8b29a1c5..ee34cb91647 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfConverter.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfConverter.java
@@ -21,10 +21,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collection;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.SOAPException;
+import jakarta.xml.soap.SOAPMessage;
 
 import org.apache.camel.Converter;
 import org.apache.camel.Exchange;
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java
index ceb0269d697..d273aecee99 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsBinding.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.cxf.jaxrs;
 import java.lang.reflect.Method;
 import java.util.Map;
 
-import javax.ws.rs.client.AsyncInvoker;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.client.AsyncInvoker;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.MultivaluedMap;
 
 import org.apache.cxf.message.Exchange;
 
@@ -112,7 +112,7 @@ public interface CxfRsBinding {
 
     /**
      * Bind the Camel message to a request {@link Entity} that gets passed to
-     * {@link AsyncInvoker#method(java.lang.String, javax.ws.rs.client.Entity, javax.ws.rs.client.InvocationCallback)}.
+     * {@link AsyncInvoker#method(java.lang.String, jakarta.ws.rs.client.Entity, jakarta.ws.rs.client.InvocationCallback)}.
      *
      * @param  camelMessage  the source message
      * @param  camelExchange the Camel exchange
@@ -126,7 +126,7 @@ public interface CxfRsBinding {
 
     /**
      * Bind the Camel message to a request {@link Entity} that gets passed to
-     * {@link AsyncInvoker#method(java.lang.String, javax.ws.rs.client.Entity, javax.ws.rs.client.InvocationCallback)}.
+     * {@link AsyncInvoker#method(java.lang.String, jakarta.ws.rs.client.Entity, jakarta.ws.rs.client.InvocationCallback)}.
      *
      * @param  camelMessage  the source message
      * @param  camelExchange the Camel exchange
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
index 8e8a2d8d321..0254077c98b 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
@@ -18,11 +18,11 @@ package org.apache.camel.component.cxf.jaxrs;
 
 import java.lang.reflect.Method;
 
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.Request;
-import javax.ws.rs.core.SecurityContext;
-import javax.ws.rs.core.UriInfo;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.Request;
+import jakarta.ws.rs.core.SecurityContext;
+import jakarta.ws.rs.core.UriInfo;
 
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.ExchangePattern;
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
index ae06e33ebca..9e9ca28c789 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
@@ -30,13 +30,13 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.InvocationCallback;
-import javax.ws.rs.client.ResponseProcessingException;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.NewCookie;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.client.InvocationCallback;
+import jakarta.ws.rs.client.ResponseProcessingException;
+import jakarta.ws.rs.core.GenericType;
+import jakarta.ws.rs.core.NewCookie;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.CamelExchangeException;
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DataFormatProvider.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DataFormatProvider.java
index a2dbf96c121..751564f0bb0 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DataFormatProvider.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DataFormatProvider.java
@@ -24,13 +24,13 @@ import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.ws.rs.BadRequestException;
-import javax.ws.rs.InternalServerErrorException;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.ext.MessageBodyReader;
-import javax.ws.rs.ext.MessageBodyWriter;
+import jakarta.ws.rs.BadRequestException;
+import jakarta.ws.rs.InternalServerErrorException;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.ext.MessageBodyReader;
+import jakarta.ws.rs.ext.MessageBodyWriter;
 
 import org.apache.camel.spi.DataFormat;
 import org.apache.cxf.jaxrs.utils.JAXRSUtils;
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
index abf9ce60650..9970c2fcbc3 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
@@ -26,12 +26,12 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import javax.security.auth.Subject;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Variant;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Variant;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePropertyKey;
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultModelResource.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultModelResource.java
index 85138d911f2..0d6a6e06846 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultModelResource.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultModelResource.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.component.cxf.jaxrs;
 
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.cxf.jaxrs.ext.DefaultMethod;
 
diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java
index 82bb49c1217..2be412b4c82 100644
--- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java
+++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java
@@ -29,18 +29,18 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.activation.DataHandler;
-import javax.activation.DataSource;
-import javax.ws.rs.CookieParam;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.HeaderParam;
-import javax.ws.rs.MatrixParam;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.Response.Status;
+import jakarta.activation.DataHandler;
+import jakarta.activation.DataSource;
+import jakarta.ws.rs.CookieParam;
+import jakarta.ws.rs.FormParam;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.MatrixParam;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.ResponseBuilder;
+import jakarta.ws.rs.core.Response.Status;
 
 import org.apache.camel.Message;
 import org.apache.camel.attachment.AttachmentMessage;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java
index fa121a36c75..e9a2b427f91 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CustomExceptionMapper.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.component.cxf.jaxrs;
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.ext.ExceptionMapper;
 
 import org.apache.camel.component.cxf.jaxrs.testbean.CustomException;
 
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsBindingConfigurationSelectionTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsBindingConfigurationSelectionTest.java
index 0ae28986eba..171d9b38aa6 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsBindingConfigurationSelectionTest.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsBindingConfigurationSelectionTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.cxf.jaxrs;
 import java.lang.reflect.Method;
 import java.util.Map;
 
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.client.Entity;
+import jakarta.ws.rs.core.MultivaluedMap;
 
 import org.apache.camel.BindToRegistry;
 import org.apache.camel.Exchange;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConvertBodyToTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConvertBodyToTest.java
index 7d111c10d09..da32417f645 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConvertBodyToTest.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConvertBodyToTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.jaxrs;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.cxf.common.CXFTestSupport;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerEndpointConfigurerTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerEndpointConfigurerTest.java
index 06c28bdf89b..64c316aeb3c 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerEndpointConfigurerTest.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerEndpointConfigurerTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.jaxrs;
 
-import javax.ws.rs.HttpMethod;
+import jakarta.ws.rs.HttpMethod;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHttpMethodHeaderTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHttpMethodHeaderTest.java
index 77529efa765..94a459bd53c 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHttpMethodHeaderTest.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHttpMethodHeaderTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.jaxrs;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/DataFormatProviderTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/DataFormatProviderTest.java
index 6c346ac1eba..382eab76ebd 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/DataFormatProviderTest.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/DataFormatProviderTest.java
@@ -22,7 +22,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.annotation.Annotation;
 
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MediaType;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.spi.DataFormat;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java
index 8df91cb1f2f..3e1fd441704 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingImplTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding;
 
 import java.io.StringWriter;
 
-import javax.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBContext;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
index b30a619bf69..767019c9498 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
@@ -23,8 +23,8 @@ import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.activation.DataHandler;
-import javax.xml.bind.JAXBContext;
+import jakarta.activation.DataHandler;
+import jakarta.xml.bind.JAXBContext;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Customer.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Customer.java
index 3a2f12fe823..8f79c6a6775 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Customer.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Customer.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 import org.apache.camel.util.ObjectHelper;
 
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerList.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerList.java
index 10c86f96ad2..fbbd2d071f9 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerList.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerList.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
 
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "CustomerList")
 public class CustomerList {
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerService.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerService.java
index 5b5eb2b5983..83451610262 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerService.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerService.java
@@ -18,15 +18,15 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
 
 import java.io.InputStream;
 
-import javax.activation.DataHandler;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
+import jakarta.activation.DataHandler;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.camel.component.cxf.jaxrs.testbean.Customer;
 
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceImpl.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceImpl.java
index 5dc1e4f88a2..363f989ac8f 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceImpl.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceImpl.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
 
 import java.io.InputStream;
 
-import javax.activation.DataHandler;
-import javax.ws.rs.core.Response;
+import jakarta.activation.DataHandler;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.camel.component.cxf.jaxrs.testbean.Customer;
 
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceResource.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceResource.java
index 2a2d8563f6a..a7b2da9f58a 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceResource.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/CustomerServiceResource.java
@@ -18,15 +18,15 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
 
 import java.io.InputStream;
 
-import javax.activation.DataHandler;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
+import jakarta.activation.DataHandler;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.camel.component.cxf.jaxrs.testbean.Customer;
 
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java
index f1c043f0eda..5b62e0d0312 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/MultipartCustomer.java
@@ -16,12 +16,12 @@
  */
 package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
 
-import javax.activation.DataHandler;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
+import jakarta.activation.DataHandler;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.cxf.jaxrs.ext.multipart.Multipart;
 
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java
index 9b427a5085a..1ab8c5af88c 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Order.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "Order")
 public class Order {
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Product.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Product.java
index 3731cefdb56..69bb31724f9 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Product.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/Product.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "Product")
 public class Product {
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/VipCustomerResource.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/VipCustomerResource.java
index d7e02c90a49..b435e958fdb 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/VipCustomerResource.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/testbean/VipCustomerResource.java
@@ -16,13 +16,13 @@
  */
 package org.apache.camel.component.cxf.jaxrs.simplebinding.testbean;
 
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
 
 public class VipCustomerResource {
 
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java
index e0b740c8761..f00deb6bb74 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.jaxrs.testbean;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 import org.apache.camel.util.ObjectHelper;
 
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
index c30fd82dd79..ae95e743fe7 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
@@ -22,15 +22,15 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.Response;
 
 import org.apache.cxf.common.util.StringUtils;
 
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java
index e36313746a1..652fbe70ab8 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java
@@ -16,13 +16,13 @@
  */
 package org.apache.camel.component.cxf.jaxrs.testbean;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.Response;
 
 // START SNIPPET: example
 @Path("/customerservice/")
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/EchoService.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/EchoService.java
index abba335cd10..5aac219f469 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/EchoService.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/EchoService.java
@@ -16,13 +16,13 @@
  */
 package org.apache.camel.component.cxf.jaxrs.testbean;
 
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Cookie;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.NewCookie;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.Cookie;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.NewCookie;
+import jakarta.ws.rs.core.Response;
 
 @Path("/echoservice/")
 public class EchoService {
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
index 0ac90a8e5bc..4e67a93d787 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
@@ -19,10 +19,10 @@ package org.apache.camel.component.cxf.jaxrs.testbean;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "Order")
 public class Order {
diff --git a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java
index d363af1055e..94f26b5256d 100644
--- a/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java
+++ b/components/camel-cxf/camel-cxf-rest/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.jaxrs.testbean;
 
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "Product")
 public class Product {
diff --git a/components/camel-cxf/camel-cxf-soap/pom.xml b/components/camel-cxf/camel-cxf-soap/pom.xml
index 7afa127ae38..61147393d24 100644
--- a/components/camel-cxf/camel-cxf-soap/pom.xml
+++ b/components/camel-cxf/camel-cxf-soap/pom.xml
@@ -33,41 +33,6 @@
     <description>Camel CXF SOAP support</description>
 
     <properties>
-        <camel.osgi.import.defaults />
-        <camel.osgi.import>
-            !org.springframework.boot.*,
-            !org.springframework.context.annotation.*;resolution:=optional,
-            !org.apache.camel.component.cxf,
-            !org.apache.camel.component.cxf.blueprint,
-            !org.apache.camel.component.cxf.converter,
-            !org.apache.camel.component.cxf.feature,
-            !org.apache.camel.component.cxf.interceptors,
-            !org.apache.camel.component.cxf.jaxrs,
-            !org.apache.camel.component.cxf.spring*,
-            !org.apache.camel.component.cxf.util,
-            !org.apache.camel.blueprint,
-            javax.activation.*;version="${javax-activation-version-range}",
-            javax.jws*;version="[0.0,3)",
-            javax.ws.rs*;version="[0.0,3)",
-            javax.xml.soap*;version="[1.3,2)",
-            javax.xml.stream*;version="[0.0,2)",
-            javax.xml.ws*;version="[0.0,3.0)",
-            org.apache.camel.*;${camel.osgi.import.camel.version},
-            org.apache.camel.component.cxf.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
-            org.apache.camel.component.cxf.jaxrs.blueprint;${camel.osgi.import.camel.version};resolution:=optional,
-            org.apache.cxf.*;version="${cxf-version-range}",
-            ${camel.osgi.import.defaults},
-            ${camel.osgi.import.additional},
-            org.osgi.service.blueprint;resolution:=optional,
-            org.osgi.service.blueprint.container;resolution:=optional,
-            org.osgi.service.blueprint.reflect;resolution:=optional,
-            org.apache.aries.blueprint;version="[1.0,2.0)";resolution:=optional,
-            org.apache.aries.blueprint.reflect;version="[1.0,2.0)";resolution:=optional,
-            org.apache.aries.blueprint.mutable;version="[1.0,2.0)";resolution:=optional,
-            org.apache.camel.blueprint;resolution:=optional,
-            *
-        </camel.osgi.import>
-        <camel.osgi.failok>true</camel.osgi.failok>
 
     </properties>
 
@@ -94,9 +59,9 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <version>${javax-servlet-api-version}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta-servlet-api-version}</version>
         </dependency>
 
         <dependency>
@@ -321,7 +286,7 @@
                             <additionalJvmArgs>${cxf.codegen.jvmArgs}</additionalJvmArgs>
                             <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
                             <defaultOptions>
-                                <frontEnd>jaxws21</frontEnd>
+                                <frontEnd>jaxws</frontEnd>
                             </defaultOptions>
                             <wsdlOptions>
                                 <wsdlOption>
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
index 5e72b235b32..7c9132244e6 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.cxf.feature;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.SOAPMessage;
 import javax.xml.transform.Source;
 
 import org.apache.camel.component.cxf.interceptors.CxfMessageSoapHeaderOutInterceptor;
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java
index 3d227085777..e548632ac11 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/interceptors/CxfMessageSoapHeaderOutInterceptor.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.interceptors;
 
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.SOAPMessage;
 
 import org.apache.cxf.binding.soap.SoapMessage;
 import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor;
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfConsumer.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfConsumer.java
index d81bcebb997..27cf41bf46b 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfConsumer.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfConsumer.java
@@ -20,7 +20,7 @@ import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.xml.ws.WebFault;
+import jakarta.xml.ws.WebFault;
 
 import org.w3c.dom.Element;
 
@@ -297,7 +297,7 @@ public class CxfConsumer extends DefaultConsumer implements Suspendable {
             }
             // bind the CXF request into a Camel exchange
             binding.populateExchangeFromCxfRequest(cxfExchange, camelExchange);
-            // extract the javax.xml.ws header
+            // extract the jakarta.xml.ws header
             Map<String, Object> context = new HashMap<>();
             binding.extractJaxWsContext(cxfExchange, context);
             // put the context into camelExchange
@@ -326,7 +326,7 @@ public class CxfConsumer extends DefaultConsumer implements Suspendable {
             // check failure again as fault could be discovered by converter
             checkFailure(camelExchange, cxfExchange);
 
-            // copy the headers javax.xml.ws header back
+            // copy the headers jakarta.xml.ws header back
             binding.copyJaxWsContext(cxfExchange, (Map<String, Object>) camelExchange.getProperty(CxfConstants.JAXWS_CONTEXT));
         }
 
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java
index b7bcadfa0c8..fbdc5a02d53 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java
@@ -39,9 +39,9 @@ import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stax.StAXSource;
 import javax.xml.transform.stream.StreamSource;
-import javax.xml.ws.Provider;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.handler.Handler;
+import jakarta.xml.ws.Provider;
+import jakarta.xml.ws.WebServiceProvider;
+import jakarta.xml.ws.handler.Handler;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpointUtils.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpointUtils.java
index dff7a9d8020..331c3a2b31f 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpointUtils.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpointUtils.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.cxf.jaxws;
 
 import java.lang.annotation.Annotation;
 
-import javax.jws.WebService;
+import jakarta.jws.WebService;
 import javax.xml.namespace.QName;
-import javax.xml.ws.WebServiceProvider;
+import jakarta.xml.ws.WebServiceProvider;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.CamelException;
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java
index 4ca7d58ba57..576385a63dd 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java
@@ -26,8 +26,8 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.Holder;
-import javax.xml.ws.handler.MessageContext.Scope;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.handler.MessageContext.Scope;
 
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.Exchange;
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java
index 0d5abb73da3..b84e01f2324 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java
@@ -34,13 +34,13 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 
-import javax.activation.DataHandler;
+import jakarta.activation.DataHandler;
 import javax.security.auth.Subject;
 import javax.xml.XMLConstants;
 import javax.xml.namespace.QName;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -1069,7 +1069,7 @@ public class DefaultCxfBinding implements CxfBinding, HeaderFilterStrategyAware
     public void extractJaxWsContext(org.apache.cxf.message.Exchange cxfExchange, Map<String, Object> context) {
         org.apache.cxf.message.Message inMessage = cxfExchange.getInMessage();
         for (Map.Entry<String, Object> entry : inMessage.entrySet()) {
-            if (entry.getKey().startsWith("javax.xml.ws")) {
+            if (entry.getKey().startsWith("jakarta.xml.ws")) {
                 context.put(entry.getKey(), entry.getValue());
             }
         }
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultPayloadProviderSEI.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultPayloadProviderSEI.java
index 891c49c9f5f..3ce6657e23d 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultPayloadProviderSEI.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultPayloadProviderSEI.java
@@ -18,12 +18,12 @@
 package org.apache.camel.component.cxf.jaxws;
 
 import javax.xml.transform.Source;
-import javax.xml.ws.Provider;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceProvider;
+import jakarta.xml.ws.Provider;
+import jakarta.xml.ws.ServiceMode;
+import jakarta.xml.ws.WebServiceProvider;
 
 @WebServiceProvider(targetNamespace = "http://camel.apache.org/cxf/jaxws/provider")
-@ServiceMode(value = javax.xml.ws.Service.Mode.PAYLOAD)
+@ServiceMode(value = jakarta.xml.ws.Service.Mode.PAYLOAD)
 public interface DefaultPayloadProviderSEI extends Provider<Source> {
     @Override
     Source invoke(Source request);
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultSEI.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultSEI.java
index afdb80e3b3c..0e1738d029c 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultSEI.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultSEI.java
@@ -16,12 +16,12 @@
  */
 package org.apache.camel.component.cxf.jaxws;
 
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
+import jakarta.jws.Oneway;
+import jakarta.jws.WebMethod;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.jws.soap.SOAPBinding.ParameterStyle;
 
 /**
  * A Default Service Endpoint Interface (aka serviceClass) to be used if neither explicit serviceClass and WSDL is
diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/WSDLServiceFactoryBean.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/WSDLServiceFactoryBean.java
index 81c8c6a837c..c4fd80dbd72 100644
--- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/WSDLServiceFactoryBean.java
+++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/WSDLServiceFactoryBean.java
@@ -21,7 +21,7 @@ import java.util.Map;
 import javax.wsdl.Definition;
 import javax.wsdl.Service;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Provider;
+import jakarta.xml.ws.Provider;
 
 import org.apache.camel.RuntimeCamelException;
 import org.apache.cxf.endpoint.Endpoint;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java
index 33807c19a57..0e6b3a16667 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.holder;
 
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.cxf.common.CXFTestSupport;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderEndpoint.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderEndpoint.java
index 88f4ed092cc..c822d8e765f 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderEndpoint.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderEndpoint.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.component.cxf.holder;
 
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Holder;
-import javax.xml.ws.RequestWrapper;
+import jakarta.jws.WebParam;
+import jakarta.jws.WebService;
+import jakarta.xml.bind.annotation.XmlSeeAlso;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.RequestWrapper;
 
 @WebService
 @XmlSeeAlso({ MyOrderType.class })
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderType.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderType.java
index 653b8cfe1e0..50eb14d27aa 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderType.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyOrderType.java
@@ -16,9 +16,9 @@
  */
 package org.apache.camel.component.cxf.holder;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 public class MyOrderType {
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyProcessor.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyProcessor.java
index cab697f24c2..018e96c793a 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyProcessor.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/holder/MyProcessor.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.holder;
 
 import java.util.List;
 
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.Holder;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java
index c2e4655acda..e9c016abd42 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.cxf.jaxws;
 import java.net.URL;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.Holder;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.cxf.common.CXFTestSupport;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringSoap12Test.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringSoap12Test.java
index 8f9b8d36761..3b876ab8cd3 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringSoap12Test.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringSoap12Test.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.jaxws;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.wsdl_first.PersonImpl12;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringTest.java
index da63f15cbfc..1daae3a5eb8 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.cxf.jaxws;
 import java.net.URL;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Endpoint;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.Endpoint;
+import jakarta.xml.ws.Holder;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayLoadMarshalFaultTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayLoadMarshalFaultTest.java
index 34754b33eee..e83b1ea03c6 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayLoadMarshalFaultTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayLoadMarshalFaultTest.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.jaxws;
 
 import java.io.StringReader;
 
-import javax.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBContext;
 import javax.xml.namespace.QName;
 
 import org.w3c.dom.Element;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadFaultTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadFaultTest.java
index b65f67578c3..3903acc28fd 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadFaultTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadFaultTest.java
@@ -20,8 +20,8 @@ import java.io.StringReader;
 import java.net.URL;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Holder;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.Holder;
 
 import org.w3c.dom.Element;
 
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerResponseTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerResponseTest.java
index 294310648a6..9e6410db8cd 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerResponseTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerResponseTest.java
@@ -20,7 +20,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerTest.java
index e3ad85b2b4d..e1dc999ed1e 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerTest.java
@@ -20,7 +20,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadBareSoapTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadBareSoapTest.java
index 732f00aefa2..dec9a492b84 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadBareSoapTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadBareSoapTest.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.cxf.jaxws;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.ws.Endpoint;
+import jakarta.jws.WebService;
+import jakarta.jws.soap.SOAPBinding;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.AvailablePortFinder;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTest.java
index e721024fa09..56d7851f0e2 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTest.java
@@ -22,7 +22,7 @@ import java.util.List;
 import javax.xml.namespace.QName;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
-import javax.xml.ws.BindingProvider;
+import jakarta.xml.ws.BindingProvider;
 
 import org.w3c.dom.Element;
 
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTestAbstract.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTestAbstract.java
index 61fa96ae68e..9cea54eac56 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTestAbstract.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTestAbstract.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.jaxws;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.camel.component.cxf.common.CXFTestSupport;
 import org.apache.camel.test.junit5.CamelTestSupport;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerContextTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerContextTest.java
index 05064803d7c..3205c39b0c2 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerContextTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerContextTest.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.ws.BindingProvider;
+import jakarta.xml.ws.BindingProvider;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSoapFaultTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSoapFaultTest.java
index 0a7479fd4ac..f7629b6fc79 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSoapFaultTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerSoapFaultTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.cxf.jaxws;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java
index 70e539a3bde..a7707519d60 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java
@@ -21,7 +21,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.ws.Endpoint;
+import jakarta.xml.ws.Endpoint;
 
 import org.w3c.dom.Document;
 
@@ -159,7 +159,7 @@ public class CxfProducerTest {
         Map<String, Object> responseContext = CastUtils.cast((Map<?, ?>) out.getHeader(Client.RESPONSE_CONTEXT));
         assertNotNull(responseContext);
         assertEquals("{http://apache.org/hello_world_soap_http}greetMe",
-                responseContext.get("javax.xml.ws.wsdl.operation").toString(), "Get the wrong wsdl operation name");
+                responseContext.get("jakarta.xml.ws.wsdl.operation").toString(), "Get the wrong wsdl operation name");
         assertEquals("Hello " + TEST_MESSAGE, result, "reply body on Camel");
 
         // check the other camel header copying
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfSchemaValidationTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfSchemaValidationTest.java
index 5a6650a2c96..cb3b6b471b9 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfSchemaValidationTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfSchemaValidationTest.java
@@ -19,9 +19,9 @@ package org.apache.camel.component.cxf.jaxws;
 import java.net.URL;
 
 import javax.xml.namespace.QName;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Holder;
-import javax.xml.ws.soap.SOAPFaultException;
+import jakarta.xml.ws.BindingProvider;
+import jakarta.xml.ws.Holder;
+import jakarta.xml.ws.soap.SOAPFaultException;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBindingTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBindingTest.java
index 5944512d1b9..8a74a2a22c8 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBindingTest.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBindingTest.java
@@ -25,8 +25,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 
-import javax.activation.DataHandler;
-import javax.activation.FileDataSource;
+import jakarta.activation.DataHandler;
+import jakarta.activation.FileDataSource;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoService.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoService.java
index ede951c5a45..e338f1b148a 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoService.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoService.java
@@ -16,7 +16,7 @@
  */
 package org.apache.camel.component.cxf.jaxws;
 
-import javax.jws.WebService;
+import jakarta.jws.WebService;
 
 @WebService
 public interface EchoService {
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoServiceSessionImpl.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoServiceSessionImpl.java
index 10b82c05916..f649a7b059c 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoServiceSessionImpl.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/EchoServiceSessionImpl.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.component.cxf.jaxws;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpSession;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.handler.MessageContext;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpSession;
+import jakarta.xml.ws.WebServiceContext;
+import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.handler.MessageContext;
 
 public class EchoServiceSessionImpl implements EchoService {
 
@@ -31,7 +31,7 @@ public class EchoServiceSessionImpl implements EchoService {
     public String echo(String text) {
         // Find the HttpSession
         MessageContext mc = context.getMessageContext();
-        HttpSession session = ((javax.servlet.http.HttpServletRequest) mc.get(MessageContext.SERVLET_REQUEST)).getSession();
+        HttpSession session = ((jakarta.servlet.http.HttpServletRequest) mc.get(MessageContext.SERVLET_REQUEST)).getSession();
         if (session == null) {
             throw new WebServiceException("No HTTP Session found");
         }
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ParameterProcessor.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ParameterProcessor.java
index 9c367da45e3..915fdfe1c2e 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ParameterProcessor.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ParameterProcessor.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.cxf.jaxws;
 
 import java.util.List;
 
-import javax.xml.soap.SOAPMessage;
+import jakarta.xml.soap.SOAPMessage;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ServiceProvider.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ServiceProvider.java
index 0e2ce5163cd..61834a514b5 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ServiceProvider.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ServiceProvider.java
@@ -17,10 +17,10 @@
 package org.apache.camel.component.cxf.jaxws;
 
 import javax.xml.transform.Source;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service.Mode;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceProvider;
+import jakarta.xml.ws.Provider;
+import jakarta.xml.ws.Service.Mode;
+import jakarta.xml.ws.ServiceMode;
+import jakarta.xml.ws.WebServiceProvider;
 
 @WebServiceProvider
 @ServiceMode(Mode.PAYLOAD)
diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/SoapMessageProvider.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/SoapMessageProvider.java
index c867647f5b8..e4b679070be 100644
--- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/SoapMessageProvider.java
+++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/SoapMessageProvider.java
@@ -16,11 +16,11 @@
  */
 package org.apache.camel.component.cxf.jaxws;
 
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceProvider;
+import jakarta.xml.soap.SOAPMessage;
... 39508 lines suppressed ...


[camel] 07/08: 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 b9dcb8d941fc097423e9d3fd95313e81b6f60161
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 cc3e2ae68c4..64192f8a79d 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] 03/08: Fix jetty cherry-pick

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 d853f18e73809d985b390c15f7f20d517b3971b7
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jan 2 10:48:51 2023 +0100

    Fix jetty cherry-pick
---
 jakarta/rewrite.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jakarta/rewrite.java b/jakarta/rewrite.java
index a8232d0f842..d5cfa9a876e 100755
--- a/jakarta/rewrite.java
+++ b/jakarta/rewrite.java
@@ -525,7 +525,7 @@ class rewrite implements Callable<Integer> {
         exec("git", "commit", "-a", "-m", "Switch to jakarta namespace");
 
         // Jetty 9 -> 11 migration
-        exec("git", "cherry-pick", "-x", "5e57bb6cc86bfdbc474f91fc2c152cb0fc03a9ff");
+        exec("git", "cherry-pick", "-x", "4dd107e0f8f0946105506aa43d187e70fefb3f9c");
         // Salesforce migration
         exec("git", "cherry-pick", "-x", "eda15c498fb3834996924607e353ecb1e37cffcc");
 


[camel] 04/08: Use cxf 4.0.0

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 804b6928db9bf3697a1a2b5441a6c41672f839bb
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jan 2 12:03:05 2023 +0100

    Use cxf 4.0.0
---
 jakarta/rewrite.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jakarta/rewrite.java b/jakarta/rewrite.java
index d5cfa9a876e..120b3f77c32 100755
--- a/jakarta/rewrite.java
+++ b/jakarta/rewrite.java
@@ -312,8 +312,8 @@ class rewrite implements Callable<Integer> {
                     "<(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-version)>.*?</\\1>", "<$1>4.0.0</$1>",
+                    "<(cxf-codegen-plugin-version)>.*?</\\1>", "<$1>4.0.0</$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>",